* lisp/gnus/shr.el (shr-put-image): Use image-multi-frame-p if available.

[gnu-emacs] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2bc47426332752be791346b3b1c1f19a849214da..2e442b6c944cb89eed0631a822765600f56d31de 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -286,7 +286,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
             (double-click-time mouse (restricted-sexp
                                       :match-alternatives (integerp 'nil 't)))
             (double-click-fuzz mouse integer "22.1")
-            (inhibit-local-menu-bar-menus menu boolean)
             (help-char keyboard character)
             (help-event-list keyboard (repeat (sexp :format "%v")))
             (menu-prompting menu boolean)
@@ -301,15 +300,15 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                      (const :tag "When sent SIGUSR2" sigusr2))
                              "24.1")
 
-;; This is not good news because it will use the wrong
-;; version-specific directories when you upgrade.  We need
-;; customization of the front of the list, maintaining the standard
-;; value intact at the back.
-;;;         (load-path environment
-;;;                    (repeat (choice :tag "[Current dir?]"
-;;;                                    :format "%[Current dir?%] %v"
-;;;                                    (const :tag " current dir" nil)
-;;;                                    (directory :format "%v"))))
+             ;; This is not good news because it will use the wrong
+             ;; version-specific directories when you upgrade.  We need
+             ;; customization of the front of the list, maintaining the
+             ;; standard value intact at the back.
+            ;;(load-path environment
+            ;;         (repeat (choice :tag "[Current dir?]"
+            ;;                         :format "%[Current dir?%] %v"
+            ;;                         (const :tag " current dir" nil)
+            ;;                         (directory :format "%v"))))
             ;; minibuf.c
             (enable-recursive-minibuffers minibuffer boolean)
             (history-length minibuffer