[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r112910: lisp/gnus/sieve.el: Fix handling of PORT pa
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] trunk r112910: lisp/gnus/sieve.el: Fix handling of PORT parameter, quitting |
Date: |
Mon, 10 Jun 2013 11:44:52 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112910
revision-id: address@hidden
parent: address@hidden
author: Albert Krewinkel <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-10 11:44:53 +0000
message:
lisp/gnus/sieve.el: Fix handling of PORT parameter, quitting
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2013-06-10 05:17:51 +0000
+++ b/lisp/gnus/ChangeLog 2013-06-10 11:44:53 +0000
@@ -1,3 +1,12 @@
+2013-06-10 Albert Krewinkel <address@hidden>
+
+ * sieve.el: Put point at beginning of buffer when viewing a script.
+ (sieve-open-server): respect the PORT parameter. Show the correct port
+ number in sieve-buffer's header. Fixed code to also work with a string
+ as port specifier. Properly close the connection on pressing 'q'. Make
+ sieve-manage-quit close the connection and process buffer. Also, remove
+ duplicate keybinding for 'q'.
+
2013-06-10 Roy Hashimoto <address@hidden> (tiny change)
* mm-view.el (mm-pkcs7-signed-magic): Allow newline in the regexp and
=== modified file 'lisp/gnus/sieve.el'
--- a/lisp/gnus/sieve.el 2013-05-24 14:36:12 +0000
+++ b/lisp/gnus/sieve.el 2013-06-10 11:44:53 +0000
@@ -109,7 +109,6 @@
;; various
(define-key map "?" 'sieve-help)
(define-key map "h" 'sieve-help)
- (define-key map "q" 'kill-buffer)
;; activating
(define-key map "m" 'sieve-activate)
(define-key map "u" 'sieve-deactivate)
@@ -152,6 +151,8 @@
(defun sieve-manage-quit ()
"Quit."
(interactive)
+ (sieve-manage-close sieve-manage-buffer)
+ (kill-buffer sieve-manage-buffer)
(kill-buffer (current-buffer)))
(defun sieve-activate (&optional pos)
@@ -206,6 +207,7 @@
(insert sieve-template))
(sieve-mode)
(setq sieve-buffer-script-name name)
+ (beginning-of-buffer)
(message
(substitute-command-keys
"Press \\[sieve-upload] to upload script to server."))))
@@ -256,10 +258,9 @@
(setq buffer-read-only nil)
(erase-buffer)
(buffer-disable-undo)
- (insert "\
-Server : " server ":" (or port sieve-manage-default-port) "
-
-")
+ (let* ((port (or port sieve-manage-default-port))
+ (header (format "Server : %s:%s\n\n" server port)))
+ (insert header))
(set (make-local-variable 'sieve-buffer-header-end)
(point-max)))
@@ -305,7 +306,7 @@
(with-current-buffer
(or ;; open server
(set (make-local-variable 'sieve-manage-buffer)
- (sieve-manage-open server))
+ (sieve-manage-open server port))
(error "Error opening server %s" server))
(sieve-manage-authenticate)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r112910: lisp/gnus/sieve.el: Fix handling of PORT parameter, quitting,
Katsumi Yamaoka <=