* net/eww.el: Rework history traversal.

[bpt/emacs.git] / lisp / printing.el

diff --git a/lisp/printing.el b/lisp/printing.el
index 26a7648..18b2b89 100644 (file)
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1,6 +1,6 @@
 ;;; printing.el --- printing utilities
 
-;; Copyright (C) 2000-2001, 2003-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2000-2001, 2003-2013 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
@@ -1342,6 +1342,10 @@ Used by `pr-menu-bind' and `pr-update-menus'.")
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; GNU Emacs Definitions
 
+(eval-and-compile
+  (unless (featurep 'xemacs)
+    (defvar pr-menu-bar nil
+      "Specify Printing menu-bar entry.")))
 
 (cond
  ((featurep 'xemacs)                   ; XEmacs
@@ -1372,9 +1376,6 @@ Used by `pr-menu-bind' and `pr-update-menus'.")
   (defun pr-menu-char-width ()
     (frame-char-width))
 
-  (defvar pr-menu-bar nil
-    "Specify Printing menu-bar entry.")
-
   ;; GNU Emacs
   ;; Menu binding
   ;; Replace existing "print" item by "Printing" item.
@@ -1800,7 +1801,7 @@ The alist element has the form:
 Where:
 
 SYMBOL         It's a symbol to identify a text printer.  It's for
-               `pr-txt-name' variable setting and for menu selection.
+               setting option `pr-txt-name' and for menu selection.
                Examples:
                        'prt_06a
                        'my_printer
@@ -1951,7 +1952,7 @@ The alist element has the form:
 Where:
 
 SYMBOL         It's a symbol to identify a PostScript printer.  It's for
-               `pr-ps-name' variable setting and for menu selection.
+               setting option `pr-ps-name' and for menu selection.
                Examples:
                        'prt_06a
                        'my_printer
@@ -2935,9 +2936,9 @@ INHERITS  Specify the inheritance for SYMBOL group.  It's a symbol name
 
                The example above has two setting groups: no-duplex and
                no-duplex-and-landscape.  When setting no-duplex is activated
-               through `inherits-from:' (see `pr-ps-utility', `pr-mode-alist'
-               and `pr-ps-printer-alist'), the variables pr-file-duplex and
-               pr-file-tumble are both set to nil.
+               through `inherits-from:' (see option `pr-ps-utility',
+               `pr-mode-alist' and `pr-ps-printer-alist'), the variables
+               pr-file-duplex and pr-file-tumble are both set to nil.
 
                Now when setting no-duplex-and-landscape is activated through
                `inherits-from:', the variable pr-file-landscape is set to nil