Merge from trunk.

5 files changed, 85 insertions, 14 deletions

diff --git a/etc/NEWS b/etc/NEWS
index e5157fd9da9..69e04cf9244 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -60,8 +60,11 @@ character when doing minibuffer filename prompts.
 ** which-function-mode now applies to all applicable major modes by default.
 
 ** erc will look up server/channel names via auth-source and use the
-   channel keys found, if any.
+channel keys found, if any.
 
+** The `server-auth-key' variable can be used to set a permanent
+shared key for Emacs Server.
+   
 ** Obsolete packages:
 
 *** mailpost.el
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c25fab9b619..5b16d78f1ca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * server.el (server-auth-key, server-generate-key): Doc fixes.
+        (server-get-auth-key): Doc fix.  Use `string-match-p'.
+        (server-start): Reflow docstring.
+
+2012-04-14  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * server.el (server-generate-key): `called-interactively-p'
+        requires a parameter.
+
+2012-04-14  Michal Nazarewicz  <mina86@mina86.com>
+
+        * server.el (server-auth-key): New variable.
+        (server-generate-key): New function.
+        (server-get-auth-key): New function.
+        (server-start): Use the new variable and functions to allow
+        setting a permanent server key (bug#9423).
+
+2012-04-14  Leo Liu  <sdl.web@gmail.com>
+
+        * vc/diff-mode.el (diff-file-prev/next): Fix typo.
+
 2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Spelling fixes.
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index bacc542a388..c8435c14ea2 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -80,7 +80,7 @@
 For other modes it is disabled.  If this is equal to t,
 then Which Function mode is enabled in any major mode that supports it."
   :group 'which-func
-  :version "24.2"                       ; added objc-mode
+  :version "24.2"                       ; explicit list -> t
   :type '(choice (const :tag "All modes" t)
                  (repeat (symbol :tag "Major mode"))))
 
diff --git a/lisp/server.el b/lisp/server.el
index 404bebc4747..058bc55d87d 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -139,6 +139,32 @@ directory residing in a NTFS partition instead."
 ;;;###autoload
 (put 'server-auth-dir 'risky-local-variable t)
 
+(defcustom server-auth-key nil
+  "Server authentication key.
+
+Normally, the authentication key is randomly generated when the
+server starts, which guarantees some level of security.  It is
+recommended to leave it that way.  Using a long-lived shared key
+will decrease security (especially since the key is transmitted as
+plain text).
+
+In some situations however, it can be difficult to share randomly
+generated passwords with remote hosts (eg. no shared directory),
+so you can set the key with this variable and then copy the
+server file to the remote host (with possible changes to IP
+address and/or port if that applies).
+
+The key must consist of 64 ASCII printable characters except for
+space (this means characters from ! to ~; or from code 33 to 126).
+
+You can use \\[server-generate-key] to get a random authentication
+key."
+  :group 'server
+  :type '(choice
+          (const :tag "Random" nil)
+          (string :tag "Password"))
+  :version "24.2")
+
 (defcustom server-raise-frame t
   "If non-nil, raise frame when switching to a buffer."
   :group 'server
@@ -522,13 +548,38 @@ See variable `server-auth-dir' for details."
       (unless safe
         (error "The directory `%s' is unsafe" dir)))))
 
+(defun server-generate-key ()
+  "Generate and return a random authentication key.
+The key is a 64-byte string of random chars in the range `!'..`~'.
+If called interactively, also inserts it into current buffer."
+  (interactive)
+  (let ((auth-key
+         (loop repeat 64
+               collect (+ 33 (random 94)) into auth
+               finally return (concat auth))))
+    (if (called-interactively-p 'interactive)
+        (insert auth-key))
+    auth-key))
+
+(defun server-get-auth-key ()
+  "Return server's authentication key.
+
+If `server-auth-key' is nil, just call `server-generate-key'.
+Otherwise, if `server-auth-key' is a valid key, return it.
+If the key is not valid, signal an error."
+  (if server-auth-key
+    (if (string-match-p "^[!-~]\\{64\\}$" server-auth-key)
+        server-auth-key
+      (error "The key '%s' is invalid" server-auth-key))
+    (server-generate-key)))
+
 ;;;###autoload
 (defun server-start (&optional leave-dead inhibit-prompt)
   "Allow this Emacs process to be a server for client processes.
-This starts a server communications subprocess through which
-client \"editors\" can send your editing commands to this Emacs
-job.  To use the server, set up the program `emacsclient' in the
-Emacs distribution as your standard \"editor\".
+This starts a server communications subprocess through which client
+\"editors\" can send your editing commands to this Emacs job.
+To use the server, set up the program `emacsclient' in the Emacs
+distribution as your standard \"editor\".
 
 Optional argument LEAVE-DEAD (interactively, a prefix arg) means just
 kill any existing server communications subprocess.
@@ -615,13 +666,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.")
           (unless server-process (error "Could not start server process"))
           (process-put server-process :server-file server-file)
           (when server-use-tcp
-            (let ((auth-key
-                   (loop
-                    ;; The auth key is a 64-byte string of random chars in the
-                    ;; range `!'..`~'.
-                    repeat 64
-                    collect (+ 33 (random 94)) into auth
-                    finally return (concat auth))))
+            (let ((auth-key (server-get-auth-key)))
               (process-put server-process :auth-key auth-key)
               (with-temp-file server-file
                 (set-buffer-multibyte nil)
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 16e33889c31..8b6b85dd22e 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -545,7 +545,7 @@ but in the file header instead, in which case move forward to the first hunk."
      (condition-case-unless-debug nil (diff-refine-hunk) (error nil))))
 
 (easy-mmode-define-navigation
- diff-file diff-file-header-re "file" diff-end-of-hunk)
+ diff-file diff-file-header-re "file" diff-end-of-file)
 
 (defun diff-restrict-view (&optional arg)
   "Restrict the view to the current hunk.