Merge remote-tracking branch 'savannah/master' into master-android-1

lisp/emacs-lisp/lisp-mode.el

@@ -559,7 +559,9 @@ This will generate compile-time constants from BINDINGS."
          (,(concat "(" cl-errs-re "\\_>")
            (1 font-lock-warning-face))
          ;; Words inside ‘’ and `' tend to be symbol names.
-         (,(concat "[`‘]\\(" (rx lisp-mode-symbol) "\\)['’]")
+         (,(concat "[`‘]\\("
+                   (rx (* lisp-mode-symbol (+ space)) lisp-mode-symbol)
+                   "\\)['’]")
           (1 font-lock-constant-face prepend))
          ;; Uninterned symbols, e.g., (defpackage #:my-package ...)
          ;; must come before keywords below to have effect

lisp/gnus/gnus.el

@@ -757,16 +757,22 @@ be used directly.")
     (september "#bf9900" "#ffcc00"))
   "Color alist used for the Gnus logo.")
 
+(defcustom gnus-logo-colors nil
+  "Colors used for the Gnus logo."
+  :set-after '(gnus-logo-color-style)
+  :type '(list color color)
+  :group 'gnus-xmas)
+
 (defcustom gnus-logo-color-style 'ma
   "Color styles used for the Gnus logo."
   :type `(choice ,@(mapcar (lambda (elem) (list 'const (car elem)))
 			   gnus-logo-color-alist))
+  :set (lambda (sym val)
+         (set-default-toplevel-value sym val)
+         (set-default-toplevel-value 'gnus-logo-colors
+                                     (cdr (assq val gnus-logo-color-alist))))
   :group 'gnus-xmas)
 
-(defvar gnus-logo-colors
-  (cdr (assq gnus-logo-color-style gnus-logo-color-alist))
-  "Colors used for the Gnus logo.")
-
 (defvar image-load-path)
 (declare-function image-size "image.c" (spec &optional pixels frame))
 

lisp/net/rcirc.el

@@ -1187,11 +1187,11 @@ element in PARTS is a list, append it to PARTS."
 (defun rcirc-buffer-process (&optional buffer)
   "Return the process associated with channel BUFFER.
 With no argument or nil as argument, use the current buffer."
-  (let ((buffer (or buffer (and (buffer-live-p rcirc-server-buffer)
-                                rcirc-server-buffer))))
-    (if buffer
-        (buffer-local-value 'rcirc-process buffer)
-      rcirc-process)))
+  (let ((buffer (or buffer (current-buffer))))
+    (buffer-local-value
+     'rcirc-process
+     (or (buffer-local-value 'rcirc-server-buffer buffer)
+         (error "Not an rcirc buffer: %S" buffer)))))
 
 (defun rcirc-server-name (process)
   "Return PROCESS server name, given by the 001 response."

lisp/term/pgtk-win.el

@@ -251,11 +251,19 @@ EVENT is a `preedit-text' event."
     ;; No themed versions available:
     ;; mail/preview (combining stock_mail and stock_zoom)
     ;; mail/save    (combining stock_mail, stock_save and stock_convert)
+    ("images/mpc/prev" . "media-skip-backward")
+    ("images/mpc/rewind" . "media-seek-backward")
+    ("images/mpc/pause" . "media-playback-pause")
+    ("images/mpc/play" . "media-playback-start")
+    ("images/mpc/ffwd" . "media-seek-forward")
+    ("images/mpc/next" . "media-skip-forward")
+    ("images/mpc/stop" . "media-playback-stop")
+    ("images/mpc/add" . "list-add")
     )
   "How icons for tool bars are mapped to Gtk+ stock items.
 Emacs must be compiled with the Gtk+ toolkit for this to have any effect.
 A value that begins with n: denotes a named icon instead of a stock icon."
-  :version "22.2"
+  :version "31.1"
   :type '(choice (repeat
 		  (choice symbol
 			  (cons (string :tag "Emacs icon")

lisp/term/x-win.el

@@ -1440,11 +1440,19 @@ This returns an error if any Emacs frames are X frames."
     ;; No themed versions available:
     ;; mail/preview (combining stock_mail and stock_zoom)
     ;; mail/save    (combining stock_mail, stock_save and stock_convert)
+    ("images/mpc/prev" . "media-skip-backward")
+    ("images/mpc/rewind" . "media-seek-backward")
+    ("images/mpc/pause" . "media-playback-pause")
+    ("images/mpc/play" . "media-playback-start")
+    ("images/mpc/ffwd" . "media-seek-forward")
+    ("images/mpc/next" . "media-skip-forward")
+    ("images/mpc/stop" . "media-playback-stop")
+    ("images/mpc/add" . "list-add")
     )
   "How icons for tool bars are mapped to Gtk+ stock items.
 Emacs must be compiled with the Gtk+ toolkit for this to have any effect.
 A value that begins with n: denotes a named icon instead of a stock icon."
-  :version "22.2"
+  :version "31.1"
   :type '(choice (repeat
 		  (choice symbol
 			  (cons (string :tag "Emacs icon")