# HG changeset patch # User Dan Nicolaescu # Date 1193107555 0 # Node ID 6b689f2a0bdc9a7d001a5f3d75d8c9c3fd0a0f81 # Parent 7064d8185d302bbd9d72df54bf7a0d5217bd2030 Move variable definitions before use. (pr-menu-char-width, pr-menu-char-height): Pacify byte compiler. diff -r 7064d8185d30 -r 6b689f2a0bdc lisp/ChangeLog --- a/lisp/ChangeLog Mon Oct 22 23:47:03 2007 +0000 +++ b/lisp/ChangeLog Tue Oct 23 02:45:55 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-23 Dan Nicolaescu + + * printing.el: Move variable definitions before use. + (pr-menu-char-width, pr-menu-char-height): Pacify byte compiler. + 2007-10-22 Juri Linkov * isearch-multi.el: New file. diff -r 7064d8185d30 -r 6b689f2a0bdc lisp/printing.el --- a/lisp/printing.el Mon Oct 22 23:47:03 2007 +0000 +++ b/lisp/printing.el Tue Oct 23 02:45:55 2007 +0000 @@ -1095,6 +1095,101 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; User Interface (I) + + +(defgroup printing nil + "Printing Utilities group." + :tag "Printing Utilities" + :link '(emacs-library-link :tag "Source Lisp File" "printing.el") + :prefix "pr-" + :version "20" + :group 'wp + :group 'postscript) + + +(defcustom pr-path-style + (if (and (not pr-cygwin-system) + ps-windows-system) + 'windows + 'unix) + "*Specify which path style to use for external commands. + +Valid values are: + + windows Windows 9x/NT style (\\) + + unix Unix style (/)" + :type '(choice :tag "Path style" + (const :tag "Windows 9x/NT Style (\\)" :value windows) + (const :tag "Unix Style (/)" :value unix)) + :version "20" + :group 'printing) + + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Customization Functions + + +(defun pr-alist-custom-set (symbol value) + "Set the value of custom variables for printer & utility selection." + (set symbol value) + (and (featurep 'printing) ; update only after printing is loaded + (pr-update-menus t))) + + +(defun pr-ps-utility-custom-set (symbol value) + "Update utility menu entry." + (set symbol value) + (and (featurep 'printing) ; update only after printing is loaded + (pr-menu-set-utility-title value))) + + +(defun pr-ps-name-custom-set (symbol value) + "Update `PostScript Printer:' menu entry." + (set symbol value) + (and (featurep 'printing) ; update only after printing is loaded + (pr-menu-set-ps-title value))) + + +(defun pr-txt-name-custom-set (symbol value) + "Update `Text Printer:' menu entry." + (set symbol value) + (and (featurep 'printing) ; update only after printing is loaded + (pr-menu-set-txt-title value))) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Internal Functions (I) + + +(defun pr-dosify-file-name (path) + "Replace unix-style directory separator character with dos/windows one." + (interactive "sPath: ") + (if (eq pr-path-style 'windows) + (subst-char-in-string ?/ ?\\ path) + path)) + + +(defun pr-unixify-file-name (path) + "Replace dos/windows-style directory separator character with unix one." + (interactive "sPath: ") + (if (eq pr-path-style 'windows) + (subst-char-in-string ?\\ ?/ path) + path)) + + +(defun pr-standard-file-name (path) + "Ensure the proper directory separator depending on the OS. +That is, if Emacs is running on DOS/Windows, ensure dos/windows-style directory +separator; otherwise, ensure unix-style directory separator." + (if (or pr-cygwin-system ps-windows-system) + (subst-char-in-string ?/ ?\\ path) + (subst-char-in-string ?\\ ?/ path))) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; User Interface (II) @@ -2317,30 +2412,6 @@ :group 'printing) -(defcustom pr-menu-char-height (pr-menu-char-height) - "*Specify menu char height in pixels. - -This variable is used to guess which vertical position should be locked the -menu, so don't forget to adjust it if menu position is not ok. - -See also `pr-menu-lock' and `pr-menu-char-width'." - :type 'integer - :version "20" - :group 'printing) - - -(defcustom pr-menu-char-width (pr-menu-char-width) - "*Specify menu char width in pixels. - -This variable is used to guess which horizontal position should be locked the -menu, so don't forget to adjust it if menu position is not ok. - -See also `pr-menu-lock' and `pr-menu-char-height'." - :type 'integer - :version "20" - :group 'printing) - - (defcustom pr-setting-database '((no-duplex ; setting symbol name nil nil nil ; inherits local kill-local @@ -2632,6 +2703,9 @@ (defvar pr-ps-utility-menu-modified t "Non-nil means `pr-ps-utility-alist' was modified and we need to update menu.") +(defvar pr-menu-char-width) ;; Pacify the byte compiler. +(defvar pr-menu-char-height) + ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; XEmacs Definitions @@ -3085,97 +3159,31 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Customization Functions - - -(defun pr-alist-custom-set (symbol value) - "Set the value of custom variables for printer & utility selection." - (set symbol value) - (and (featurep 'printing) ; update only after printing is loaded - (pr-update-menus t))) - - -(defun pr-ps-utility-custom-set (symbol value) - "Update utility menu entry." - (set symbol value) - (and (featurep 'printing) ; update only after printing is loaded - (pr-menu-set-utility-title value))) - - -(defun pr-ps-name-custom-set (symbol value) - "Update `PostScript Printer:' menu entry." - (set symbol value) - (and (featurep 'printing) ; update only after printing is loaded - (pr-menu-set-ps-title value))) - - -(defun pr-txt-name-custom-set (symbol value) - "Update `Text Printer:' menu entry." - (set symbol value) - (and (featurep 'printing) ; update only after printing is loaded - (pr-menu-set-txt-title value))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; User Interface (I) - - -(defgroup printing nil - "Printing Utilities group." - :tag "Printing Utilities" - :link '(emacs-library-link :tag "Source Lisp File" "printing.el") - :prefix "pr-" - :version "20" - :group 'wp - :group 'postscript) - - -(defcustom pr-path-style - (if (and (not pr-cygwin-system) - ps-windows-system) - 'windows - 'unix) - "*Specify which path style to use for external commands. - -Valid values are: - - windows Windows 9x/NT style (\\) - - unix Unix style (/)" - :type '(choice :tag "Path style" - (const :tag "Windows 9x/NT Style (\\)" :value windows) - (const :tag "Unix Style (/)" :value unix)) +;; User Interface (III) + +(defcustom pr-menu-char-height (pr-menu-char-height) + "*Specify menu char height in pixels. + +This variable is used to guess which vertical position should be locked the +menu, so don't forget to adjust it if menu position is not ok. + +See also `pr-menu-lock' and `pr-menu-char-width'." + :type 'integer :version "20" :group 'printing) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Internal Functions (I) - - -(defun pr-dosify-file-name (path) - "Replace unix-style directory separator character with dos/windows one." - (interactive "sPath: ") - (if (eq pr-path-style 'windows) - (subst-char-in-string ?/ ?\\ path) - path)) - - -(defun pr-unixify-file-name (path) - "Replace dos/windows-style directory separator character with unix one." - (interactive "sPath: ") - (if (eq pr-path-style 'windows) - (subst-char-in-string ?\\ ?/ path) - path)) - - -(defun pr-standard-file-name (path) - "Ensure the proper directory separator depending on the OS. -That is, if Emacs is running on DOS/Windows, ensure dos/windows-style directory -separator; otherwise, ensure unix-style directory separator." - (if (or pr-cygwin-system ps-windows-system) - (subst-char-in-string ?/ ?\\ path) - (subst-char-in-string ?\\ ?/ path))) +(defcustom pr-menu-char-width (pr-menu-char-width) + "*Specify menu char width in pixels. + +This variable is used to guess which horizontal position should be locked the +menu, so don't forget to adjust it if menu position is not ok. + +See also `pr-menu-lock' and `pr-menu-char-height'." + :type 'integer + :version "20" + :group 'printing) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Macros