Merge from emacs-24; up to 2014-06-01T23:37:59Z!eggert@cs.ucla.edu

9 files changed, 112 insertions, 34 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 735a558aa62..80105470985 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,53 @@
+2014-06-08  Juri Linkov  <juri@jurta.org>
+
+        * desktop.el: Activate auto-saving on window configuration changes.
+        (desktop-save-mode, desktop-auto-save-timeout): Add/remove
+        `desktop-auto-save-set-timer' to/from
+        `window-configuration-change-hook'.
+        (desktop-auto-save-set-timer): Change REPEAT arg of
+        `run-with-idle-timer' from t to nil.
+        http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00147.html
+
+2014-06-08  Santiago Payà i Miralta  <santiagopim@gmail.com>
+
+        * vc/vc-hg.el (vc-hg-working-revision): Use "hg parent" and
+        vc-hg-command (bug#17570).
+
+2014-06-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * international/mule-cmds.el (ucs-names): Add special entry for BEL
+        (bug#17702).
+
+2014-06-08  Glenn Morris  <rgm@gnu.org>
+
+        * startup.el (window-setup-hook): Doc fix.
+
+        * emacs-lisp/package.el (package-check-signature)
+        (package-unsigned-archives): Doc fixes.
+
+2014-06-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-use-some-window): Don't make window
+        used smaller than it was before (Bug#17671).
+
+2014-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * menu-bar.el (menu-bar-open): Fix last change: use the PC
+        'redisplay' instead of '(sit-for 0)'.
+
+2014-06-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-ssh-controlmaster-options):
+        Improve search regexp.  (Bug#17653)
+
+2014-06-08  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/package.el (package-pinned-packages): Doc fix.
+
+2014-06-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * menu-bar.el (menu-bar-open): Fix invocation via M-x.
+
 2014-06-06  Santiago Payà i Miralta  <santiagopim@gmail.com>
 
         * vc/vc-hg.el (vc-hg-create-tag, vc-hg-retrieve-tag): New functions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index ded73c065f0..d420a6416a9 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -174,7 +174,10 @@ For further details, see info node `(emacs)Saving Emacs Sessions'."
   :global t
   :group 'desktop
   (if desktop-save-mode
-      (desktop-auto-save-set-timer)
+      (when (and (integerp desktop-auto-save-timeout)
+                 (> desktop-auto-save-timeout 0))
+        (add-hook 'window-configuration-change-hook 'desktop-auto-save-set-timer))
+    (remove-hook 'window-configuration-change-hook 'desktop-auto-save-set-timer)
     (desktop-auto-save-cancel-timer)))
 
 (defun desktop-save-mode-off ()
@@ -207,13 +210,18 @@ determine where the desktop is saved."
 
 (defcustom desktop-auto-save-timeout auto-save-timeout
   "Number of seconds idle time before auto-save of the desktop.
+The idle timer activates auto-saving only when window configuration changes.
 This applies to an existing desktop file when `desktop-save-mode' is enabled.
 Zero or nil means disable auto-saving due to idleness."
   :type '(choice (const :tag "Off" nil)
                  (integer :tag "Seconds"))
   :set (lambda (symbol value)
          (set-default symbol value)
-         (ignore-errors (desktop-auto-save-set-timer)))
+         (ignore-errors
+           (if (and (integerp value) (> value 0))
+               (add-hook 'window-configuration-change-hook 'desktop-auto-save-set-timer)
+             (remove-hook 'window-configuration-change-hook 'desktop-auto-save-set-timer)
+             (desktop-auto-save-cancel-timer))))
   :group 'desktop
   :version "24.4")
 
@@ -1244,7 +1252,7 @@ after that many seconds of idle time."
   (when (and (integerp desktop-auto-save-timeout)
              (> desktop-auto-save-timeout 0))
     (setq desktop-auto-save-timer
-          (run-with-idle-timer desktop-auto-save-timeout t
+          (run-with-idle-timer desktop-auto-save-timeout nil
                                'desktop-auto-save))))
 
 (defun desktop-auto-save-cancel-timer ()
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d65633282c9..7ca62464bd0 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -113,8 +113,6 @@
 
 ;;; ToDo:
 
-;; - a trust mechanism, since compiling a package can run arbitrary code.
-;;   For example, download package signatures and check that they match.
 ;; - putting info dirs at the start of the info path means
 ;;   users see a weird ordering of categories.  OTOH we want to
 ;;   override later entries.  maybe emacs needs to enforce
@@ -229,18 +227,25 @@ a package can run arbitrary code."
   :version "24.1")
 
 (defcustom package-pinned-packages nil
-  "An alist of packages that are pinned to a specific archive
-
-Each element has the form (SYM . ID).
- SYM is a package, as a symbol.
- ID is an archive name. This should correspond to an
- entry in `package-archives'.
-
-If the archive of name ID does not contain the package SYM, no
-other location will be considered, which will make the
-package unavailable."
+  "An alist of packages that are pinned to specific archives.
+This can be useful if you have multiple package archives enabled,
+and want to control which archive a given package gets installed from.
+
+Each element of the alist has the form (PACKAGE . ARCHIVE), where:
+ PACKAGE is a symbol representing a package
+ ARCHIVE is a string representing an archive (it should be the car of
+an element in `package-archives', e.g. \"gnu\").
+
+Adding an entry to this variable means that only ARCHIVE will be
+considered as a source for PACKAGE.  If other archives provide PACKAGE,
+they are ignored (for this package).  If ARCHIVE does not contain PACKAGE,
+the package will be unavailable."
   :type '(alist :key-type (symbol :tag "Package")
                 :value-type (string :tag "Archive name"))
+  ;; I don't really see why this is risky...
+  ;; I suppose it could prevent you receiving updates for a package,
+  ;; via an entry (PACKAGE . NON-EXISTING).  Which could be an issue
+  ;; if PACKAGE has a known vulnerability that is fixed in newer versions.
   :risky t
   :group 'package
   :version "24.4")
@@ -285,7 +290,12 @@ contrast, `package-user-dir' contains packages for personal use."
   :version "24.1")
 
 (defcustom package-check-signature 'allow-unsigned
-  "Whether to check package signatures when installing."
+  "Non-nil means to check package signatures when installing.
+The value `allow-unsigned' means to still install a package even if
+it is unsigned.
+
+This also applies to the \"archive-contents\" file that lists the
+contents of the archive."
   :type '(choice (const nil :tag "Never")
                  (const allow-unsigned :tag "Allow unsigned")
                  (const t :tag "Check always"))
@@ -294,7 +304,7 @@ contrast, `package-user-dir' contains packages for personal use."
   :version "24.4")
 
 (defcustom package-unsigned-archives nil
-  "A list of archives which do not use package signature."
+  "List of archives where we do not check for package signatures."
   :type '(repeat (string :tag "Archive name"))
   :risky t
   :group 'package
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index f83e64e3921..0a2f09029da 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2945,7 +2945,10 @@ on encoding."
             (if (setq name (get-char-code-property c 'name))
                 (push (cons name c) names))
             (setq c (1+ c))))
-        (setq ucs-names names))))
+        ;; Special case for "BELL" which is apparently the only char which
+        ;; doesn't have a new name and whose old-name is shadowed by a newer
+        ;; char with that name.
+        (setq ucs-names `(("BELL (BEL)" . 7) ,@names)))))
 
 (defun read-char-by-name (prompt)
   "Read a character by its Unicode name or hex number string.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index efbeeb3579c..c816488c6d1 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2272,6 +2272,12 @@ If FRAME is nil or not given, use the selected frame."
      ((eq type 'w32) (w32-menu-bar-open frame))
      ((and (null tty-menu-open-use-tmm)
            (not (zerop (or (frame-parameter nil 'menu-bar-lines) 0))))
+      ;; Make sure the menu bar is up to date.  One situation where
+      ;; this is important is when this function is invoked by name
+      ;; via M-x, in which case the menu bar includes the "Minibuf"
+      ;; menu item that should be removed when we exit the minibuffer.
+      (force-mode-line-update)
+      (redisplay)
       (let* ((x tty-menu--initial-menu-x)
              (menu (menu-bar-menu-at-x-y x 0 frame)))
         (popup-menu (or
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 116db733865..307e89dbd3b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -302,18 +302,19 @@ useful only in combination with `tramp-default-proxies-alist'.")
 
 ;;;###tramp-autoload
 (defconst tramp-ssh-controlmaster-options
-  (let ((result ""))
+  (let ((result "")
+        (case-fold-search t))
     (ignore-errors
       (with-temp-buffer
         (call-process "ssh" nil t nil "-o" "ControlMaster")
         (goto-char (point-min))
-        (when (search-forward-regexp "Missing ControlMaster argument" nil t)
+        (when (search-forward-regexp "missing.+argument" nil t)
           (setq result "-o ControlPath=%t.%%r@%%h:%%p -o ControlMaster=auto")))
-      (when result
+      (unless (zerop (length result))
         (with-temp-buffer
           (call-process "ssh" nil t nil "-o" "ControlPersist")
           (goto-char (point-min))
-          (when (search-forward-regexp "Missing ControlPersist argument" nil t)
+          (when (search-forward-regexp "missing.+argument" nil t)
             (setq result (concat result " -o ControlPersist=no"))))))
     result)
     "Call ssh to detect whether it supports the Control* arguments.
diff --git a/lisp/startup.el b/lisp/startup.el
index ef531af12df..5a4ddf335c4 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -303,9 +303,12 @@ keys for use under X.  It is used in a fashion analogous to the
 environment variable TERM.")
 
 (defvar window-setup-hook nil
-  "Normal hook run to initialize window system display.
-Emacs runs this hook after processing the command line arguments and loading
-the user's init file.")
+  "Normal hook run after loading init files and handling the command line.
+This is very similar to `emacs-startup-hook'.  The only difference
+is that this hook runs after frame parameters have been set up in
+response to any settings from your init file.  Unless this matters
+to you, use `emacs-startup-hook' instead.  (The name of this hook
+is due to historical reasons, and does not reflect its purpose very well.)")
 
 (defcustom initial-major-mode 'lisp-interaction-mode
   "Major mode command symbol to use for the initial `*scratch*' buffer."
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 598a84a5739..df61006ad51 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -234,14 +234,11 @@ highlighting the Log View buffer."
 
 (defun vc-hg-working-revision (file)
   "Hg-specific version of `vc-working-revision'."
-  (let ((default-directory (if (file-directory-p file)
-                               (file-name-as-directory file)
-                             (file-name-directory file))))
-    (ignore-errors
-      (with-output-to-string
-        (process-file vc-hg-program nil standard-output nil
-                      "log" "-l" "1" "--template" "{rev}"
-                      (file-relative-name file))))))
+  (or (ignore-errors
+        (with-output-to-string
+          (vc-hg-command standard-output 0 file
+                         "parent" "--template" "{rev}")))
+      "0"))
 
 ;;; History functions
 
diff --git a/lisp/window.el b/lisp/window.el
index c5093ca51a5..e9f4fd0b1d2 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6497,7 +6497,7 @@ that frame."
       ;; resize it to its old height but don't signal an error.
       (when (and (listp quad)
                  (integerp (nth 3 quad))
-                 (/= (nth 3 quad) (window-total-height window)))
+                 (> (nth 3 quad) (window-total-height window)))
         (condition-case nil
             (window-resize window (- (nth 3 quad) (window-total-height window)))
           (error nil)))