Merge from emacs-24; up to 2014-05-01T10:21:17Z!rgm@gnu.org

7 files changed, 65 insertions, 25 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d58fd9cdc08..04d57aa8125 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,35 @@
+2014-04-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * dired.el (dired-initial-position-hook, dired-initial-position):
+        Doc string fixes.
+
+2014-04-30  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmail.el (rmail-quit): Handle killed summaries.  (Bug#17283)
+
+2014-04-30  Matthias Dahl  <matthias.dahl@binary-island.eu>
+
+        * faces.el (face-spec-recalc): Apply X resources only after the
+        defface spec has been applied. Thus, X resources are no longer
+        overriden by the defface spec which also fixes issues on win32 where
+        the toolbar coloring was wrong because it is set through X resources
+        and was (wrongfully) overriden.  (Bug#16694)
+
+2014-04-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/rst.el (electric-pair-pairs): Declare.
+        (rst-mode): Set it (bug#17131).
+
+2014-04-30  Juri Linkov  <juri@jurta.org>
+
+        * desktop.el (desktop-value-to-string): Let-bind `print-length'
+        and `print-level' to nil.  (Bug#17351)
+
+2014-04-30  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
+
+        * battery.el (battery-update): Handle the case where battery
+        status is "N/A" (bug#17319).
+
 2014-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/ps-mode.el: Use SMIE.  Move string and comment recognition
diff --git a/lisp/battery.el b/lisp/battery.el
index 1eef80ab339..b49363489a8 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -201,19 +201,18 @@ seconds."
 
 (defun battery-update ()
   "Update battery status information in the mode line."
-  (let ((data (and battery-status-function (funcall battery-status-function))))
+  (let* ((data (and battery-status-function (funcall battery-status-function)))
+         (percentage (car (read-from-string (cdr (assq ?p data))))))
     (setq battery-mode-line-string
           (propertize (if (and battery-mode-line-format
-                               (<= (car (read-from-string (cdr (assq ?p data))))
-                                   battery-mode-line-limit))
-                          (battery-format
-                           battery-mode-line-format
-                           data)
+                               (numberp percentage)
+                               (<= percentage battery-mode-line-limit))
+                          (battery-format battery-mode-line-format data)
                         "")
                       'face
-                      (and (<= (car (read-from-string (cdr (assq ?p data))))
-                                   battery-load-critical)
-                           'error)
+                      (and (numberp percentage)
+                           (<= percentage battery-load-critical)
+                           'error)
                       'help-echo "Battery status information")))
   (force-mode-line-update))
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 5e43c03ade7..ded73c065f0 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -844,12 +844,13 @@ QUOTE may be `may' (value may be quoted),
   "Convert VALUE to a string that when read evaluates to the same value.
 Not all types of values are supported."
   (let* ((print-escape-newlines t)
+         (print-length nil)
+         (print-level nil)
          (float-output-format nil)
          (quote.sexp (desktop--v2s value))
          (quote (car quote.sexp))
-         (txt
-          (let ((print-quoted t))
-            (prin1-to-string (cdr quote.sexp)))))
+         (print-quoted t)
+         (txt (prin1-to-string (cdr quote.sexp))))
     (if (eq quote 'must)
         (concat "'" txt)
       txt)))
diff --git a/lisp/dired.el b/lisp/dired.el
index fd897b9f7b5..364975e7a2b 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -222,7 +222,7 @@ with the buffer narrowed to the listing."
 
 (defcustom dired-initial-position-hook nil
   "This hook is used to position the point.
-It is run the function `dired-initial-position'."
+It is run by the function `dired-initial-position'."
   :group 'dired
   :type 'hook
   :version "24.4")
@@ -2768,7 +2768,7 @@ as returned by `dired-get-filename'.  LIMIT is the search limit."
 ;; FIXME document whatever dired-x is doing.
 (defun dired-initial-position (dirname)
   "Where point should go in a new listing of DIRNAME.
-Point assumed at beginning of new subdir line.
+Point is assumed to be at the beginning of new subdir line.
 It runs the hook `dired-initial-position-hook'."
   (end-of-line)
   (and (featurep 'dired-x) dired-find-subdir
diff --git a/lisp/faces.el b/lisp/faces.el
index 9c115473542..d8b3c7a6b0f 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1652,18 +1652,22 @@ function for its other effects."
 
 (defun face-spec-recalc (face frame)
   "Reset the face attributes of FACE on FRAME according to its specs.
-After the reset, the specs are applied from the following sources in this order:
-  X resources (if applicable)
+The following sources are applied in this order:
+
+  face reset to default values if it's the default face, otherwise set
+  to unspecified (through `face-spec-reset-face')
    |
   (theme and user customization)
-    or, if nonexistent or does not match the current frame,
+    or: if none of the above exist, and none match the current frame or
+        inherited from the defface spec instead of overwriting it
+        entirely, the following is applied instead:
   (defface default spec)
+  (X resources (if applicable))
    |
   defface override spec"
   (while (get face 'face-alias)
     (setq face (get face 'face-alias)))
   (face-spec-reset-face face frame)
-  (make-face-x-resource-internal face frame)
   ;; If FACE is customized or themed, set the custom spec from
   ;; `theme-face' records.
   (let ((theme-faces (get face 'theme-face))
@@ -1677,10 +1681,12 @@ After the reset, the specs are applied from the following sources in this order:
             (setq theme-face-applied t))))
     ;; If there was a spec applicable to FRAME, that overrides the
     ;; defface spec entirely (rather than inheriting from it).  If
-    ;; there was no spec applicable to FRAME, apply the defface spec.
+    ;; there was no spec applicable to FRAME, apply the defface spec
+    ;; as well as any applicable X resources.
     (unless theme-face-applied
       (setq spec (face-spec-choose (face-default-spec face) frame))
-      (face-spec-set-2 face frame spec))
+      (face-spec-set-2 face frame spec)
+      (make-face-x-resource-internal face frame))
     (setq spec (face-spec-choose (get face 'face-override-spec) frame))
     (face-spec-set-2 face frame spec)))
 
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 3146e28e1ca..673a85dc4c7 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1,7 +1,6 @@
 ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
 
-;; Copyright (C) 1985-1988, 1993-1998, 2000-2014 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985-1988, 1993-1998, 2000-2014 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
@@ -1573,7 +1572,7 @@ Hook `rmail-quit-hook' is run after expunging."
   (when (boundp 'rmail-quit-hook)
     (run-hooks 'rmail-quit-hook))
   ;; Don't switch to the summary buffer even if it was recently visible.
-  (when rmail-summary-buffer
+  (when (rmail-summary-exists)
     (with-current-buffer rmail-summary-buffer
       (set-buffer-modified-p nil))
     (replace-buffer-in-windows rmail-summary-buffer)
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index d4a3438ce97..b05a5e5a7e3 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -784,11 +784,9 @@ This inherits from Text mode.")
     (modify-syntax-entry ?\u2019 "." st)
     (modify-syntax-entry ?\u201c "." st)
     (modify-syntax-entry ?\u201d "." st)
-
     st)
   "Syntax table used while in `rst-mode'.")
 
-
 (defcustom rst-mode-hook nil
   "Hook run when `rst-mode' is turned on.
 The hook for `text-mode' is run before this one."
@@ -799,6 +797,8 @@ The hook for `text-mode' is run before this one."
 ;; Pull in variable definitions silencing byte-compiler.
 (require 'newcomment)
 
+(defvar electric-pair-pairs)
+
 ;; Use rst-mode for *.rst and *.rest files.  Many ReStructured-Text files
 ;; use *.txt, but this is too generic to be set as a default.
 ;;;###autoload (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode)))
@@ -860,6 +860,9 @@ highlighting.
   (set (make-local-variable 'uncomment-region-function)
        'rst-uncomment-region)
 
+  (set (make-local-variable 'electric-pair-pairs)
+       '((?\" . ?\") (?\* . ?\*) (?\` . ?\`)))
+
   ;; Imenu and which function.
   ;; FIXME: Check documentation of `which-function' for alternative ways to
   ;;        determine the current function name.