[Emacs-diffs] Changes to emacs/lisp/printing.el,v

[Chong Yidong]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/11/06 15:13:24

Index: printing.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/printing.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- printing.el 20 Sep 2006 19:59:03 -0000      1.37
+++ printing.el 6 Nov 2006 15:13:24 -0000       1.38
@@ -1144,6 +1144,7 @@
   "Set the value of custom variables for printer & utility selection."
   (set symbol value)
   (and (featurep 'printing)            ; update only after printing is loaded
+       (not pr-menu-print-item)
        (pr-update-menus t)))
 
 
@@ -1151,6 +1152,7 @@
   "Update utility menu entry."
   (set symbol value)
   (and (featurep 'printing)            ; update only after printing is loaded
+       (not pr-menu-print-item)
        (pr-menu-set-utility-title value)))
 
 
@@ -1158,6 +1160,7 @@
   "Update `PostScript Printer:' menu entry."
   (set symbol value)
   (and (featurep 'printing)            ; update only after printing is loaded
+       (not pr-menu-print-item)
        (pr-menu-set-ps-title value)))
 
 
@@ -1165,6 +1168,7 @@
   "Update `Text Printer:' menu entry."
   (set symbol value)
   (and (featurep 'printing)            ; update only after printing is loaded
+       (not pr-menu-print-item)
        (pr-menu-set-txt-title value)))
 
 
@@ -3096,23 +3100,21 @@
                                  (pr-get-symbol "Printing")))))
      ;; Emacs 21 & 22
      (t
-      (let* ((has-file  (lookup-key global-map (vector 'menu-bar 'file)))
-            (item-file (if has-file '("file") '("files"))))
        (cond
         (pr-menu-print-item
-         (easy-menu-change item-file "Print" pr-menu-spec "print-buffer")
-         (let ((items '("print-buffer"          "print-region"
+       (easy-menu-add-item menu-bar-file-menu nil
+                           (easy-menu-create-menu "Print" pr-menu-spec)
+                           "print-buffer")
+       (dolist (item '("print-buffer"          "print-region"
                         "ps-print-buffer-faces" "ps-print-region-faces"
-                        "ps-print-buffer"       "ps-print-region")))
-           (while items
-             (easy-menu-remove-item nil item-file (car items))
-             (setq items (cdr items)))
+                       "ps-print-buffer"       "ps-print-region"))
+         (easy-menu-remove-item menu-bar-file-menu nil item))
            (setq pr-menu-print-item nil
                  pr-menu-bar (vector 'menu-bar
-                                     (if has-file 'file 'files)
-                                     (pr-get-symbol "Print")))))
+                                 'file
+                                 (pr-get-symbol "Print"))))
         (t
-         (easy-menu-change item-file "Print" pr-menu-spec))))))))
+       (easy-menu-change '("file") "Print" pr-menu-spec)))))))
   (pr-update-menus t))