diff options
| author | Dan Nicolaescu | 2007-11-01 04:00:22 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-11-01 04:00:22 +0000 |
| commit | 6a2c788ebcb5fe75ad2dc9d81c9a5ca3aa2d1360 (patch) | |
| tree | 51a40d3cf2f98dd0e7d552fa805661132015d687 | |
| parent | 87006f3e0a209add511b15b3c75ff0ea34b88bc2 (diff) | |
| download | emacs-6a2c788ebcb5fe75ad2dc9d81c9a5ca3aa2d1360.tar.gz emacs-6a2c788ebcb5fe75ad2dc9d81c9a5ca3aa2d1360.zip | |
* printing.el (printing): Fix :version, printing.el was included
for in emacs-22.1.
(pr-path-style, pr-path-alist, pr-txt-name)
(pr-txt-printer-alist, pr-ps-name, pr-ps-printer-alist)
(pr-temp-dir, pr-ps-temp-file, pr-file-modes, pr-gv-command)
(pr-gs-command, pr-gs-switches, pr-gs-device, pr-gs-resolution)
(pr-print-using-ghostscript, pr-file-tumble, pr-auto-region)
(pr-auto-mode, pr-mode-alist, pr-ps-utility)
(pr-ps-utility-alist, pr-menu-char-height, pr-menu-char-width)
(pr-setting-database, pr-visible-entry-list)
(pr-delete-temp-file, pr-list-directory, pr-buffer-name)
(pr-buffer-name-ignore, pr-buffer-verbose): Remove incorrect
:version.
| -rw-r--r-- | lisp/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/printing.el | 37 |
2 files changed, 15 insertions, 36 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a40c31533db..95ed6811154 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -18,6 +18,20 @@ | |||
| 18 | 18 | ||
| 19 | 2007-11-01 Dan Nicolaescu <dann@ics.uci.edu> | 19 | 2007-11-01 Dan Nicolaescu <dann@ics.uci.edu> |
| 20 | 20 | ||
| 21 | * printing.el (printing): Fix :version, printing.el was included | ||
| 22 | for in emacs-22.1. | ||
| 23 | (pr-path-style, pr-path-alist, pr-txt-name) | ||
| 24 | (pr-txt-printer-alist, pr-ps-name, pr-ps-printer-alist) | ||
| 25 | (pr-temp-dir, pr-ps-temp-file, pr-file-modes, pr-gv-command) | ||
| 26 | (pr-gs-command, pr-gs-switches, pr-gs-device, pr-gs-resolution) | ||
| 27 | (pr-print-using-ghostscript, pr-file-tumble, pr-auto-region) | ||
| 28 | (pr-auto-mode, pr-mode-alist, pr-ps-utility) | ||
| 29 | (pr-ps-utility-alist, pr-menu-char-height, pr-menu-char-width) | ||
| 30 | (pr-setting-database, pr-visible-entry-list) | ||
| 31 | (pr-delete-temp-file, pr-list-directory, pr-buffer-name) | ||
| 32 | (pr-buffer-name-ignore, pr-buffer-verbose): Remove incorrect | ||
| 33 | :version. | ||
| 34 | |||
| 21 | * ediff-util.el (ediff-nuke-selective-display): Move definition to | 35 | * ediff-util.el (ediff-nuke-selective-display): Move definition to |
| 22 | top level, make it dependent on the emacs flavor. | 36 | top level, make it dependent on the emacs flavor. |
| 23 | 37 | ||
diff --git a/lisp/printing.el b/lisp/printing.el index 245d21d7de5..6de22743c97 100644 --- a/lisp/printing.el +++ b/lisp/printing.el | |||
| @@ -1674,7 +1674,7 @@ separator; otherwise, ensure unix-style directory separator." | |||
| 1674 | :tag "Printing Utilities" | 1674 | :tag "Printing Utilities" |
| 1675 | :link '(emacs-library-link :tag "Source Lisp File" "printing.el") | 1675 | :link '(emacs-library-link :tag "Source Lisp File" "printing.el") |
| 1676 | :prefix "pr-" | 1676 | :prefix "pr-" |
| 1677 | :version "20" | 1677 | :version "22.1" |
| 1678 | :group 'wp | 1678 | :group 'wp |
| 1679 | :group 'postscript) | 1679 | :group 'postscript) |
| 1680 | 1680 | ||
| @@ -1694,7 +1694,6 @@ Valid values are: | |||
| 1694 | :type '(choice :tag "Path style" | 1694 | :type '(choice :tag "Path style" |
| 1695 | (const :tag "Windows 9x/NT Style (\\)" :value windows) | 1695 | (const :tag "Windows 9x/NT Style (\\)" :value windows) |
| 1696 | (const :tag "Unix Style (/)" :value unix)) | 1696 | (const :tag "Unix Style (/)" :value unix)) |
| 1697 | :version "20" | ||
| 1698 | :group 'printing) | 1697 | :group 'printing) |
| 1699 | 1698 | ||
| 1700 | 1699 | ||
| @@ -1773,7 +1772,6 @@ Examples: | |||
| 1773 | :tag "Directory" | 1772 | :tag "Directory" |
| 1774 | (string :value "") | 1773 | (string :value "") |
| 1775 | (symbol :value symbol))))) | 1774 | (symbol :value symbol))))) |
| 1776 | :version "20" | ||
| 1777 | :group 'printing) | 1775 | :group 'printing) |
| 1778 | 1776 | ||
| 1779 | 1777 | ||
| @@ -1788,7 +1786,6 @@ modified by other means (for example, a lisp function), use `pr-update-menus' | |||
| 1788 | function (see it for documentation) to update text printer menu." | 1786 | function (see it for documentation) to update text printer menu." |
| 1789 | :type 'symbol | 1787 | :type 'symbol |
| 1790 | :set 'pr-txt-name-custom-set | 1788 | :set 'pr-txt-name-custom-set |
| 1791 | :version "20" | ||
| 1792 | :group 'printing) | 1789 | :group 'printing) |
| 1793 | 1790 | ||
| 1794 | 1791 | ||
| @@ -1921,7 +1918,6 @@ Useful links: | |||
| 1921 | (const :tag "None" nil) | 1918 | (const :tag "None" nil) |
| 1922 | string))) | 1919 | string))) |
| 1923 | :set 'pr-alist-custom-set | 1920 | :set 'pr-alist-custom-set |
| 1924 | :version "20" | ||
| 1925 | :group 'printing) | 1921 | :group 'printing) |
| 1926 | 1922 | ||
| 1927 | 1923 | ||
| @@ -1936,7 +1932,6 @@ modified by other means (for example, a lisp function), use `pr-update-menus' | |||
| 1936 | function (see it for documentation) to update PostScript printer menu." | 1932 | function (see it for documentation) to update PostScript printer menu." |
| 1937 | :type 'symbol | 1933 | :type 'symbol |
| 1938 | :set 'pr-ps-name-custom-set | 1934 | :set 'pr-ps-name-custom-set |
| 1939 | :version "20" | ||
| 1940 | :group 'printing) | 1935 | :group 'printing) |
| 1941 | 1936 | ||
| 1942 | 1937 | ||
| @@ -2209,7 +2204,6 @@ Useful links: | |||
| 2209 | (sexp :tag "Value"))) | 2204 | (sexp :tag "Value"))) |
| 2210 | )) | 2205 | )) |
| 2211 | :set 'pr-alist-custom-set | 2206 | :set 'pr-alist-custom-set |
| 2212 | :version "20" | ||
| 2213 | :group 'printing) | 2207 | :group 'printing) |
| 2214 | 2208 | ||
| 2215 | 2209 | ||
| @@ -2228,7 +2222,6 @@ Useful links: | |||
| 2228 | 2222 | ||
| 2229 | See also `pr-ps-temp-file' and `pr-file-modes'." | 2223 | See also `pr-ps-temp-file' and `pr-file-modes'." |
| 2230 | :type '(directory :tag "Temporary Directory") | 2224 | :type '(directory :tag "Temporary Directory") |
| 2231 | :version "20" | ||
| 2232 | :group 'printing) | 2225 | :group 'printing) |
| 2233 | 2226 | ||
| 2234 | 2227 | ||
| @@ -2237,7 +2230,6 @@ See also `pr-ps-temp-file' and `pr-file-modes'." | |||
| 2237 | 2230 | ||
| 2238 | See also `pr-temp-dir' and `pr-file-modes'." | 2231 | See also `pr-temp-dir' and `pr-file-modes'." |
| 2239 | :type '(file :tag "PostScript Temporary File Name") | 2232 | :type '(file :tag "PostScript Temporary File Name") |
| 2240 | :version "21" | ||
| 2241 | :group 'printing) | 2233 | :group 'printing) |
| 2242 | 2234 | ||
| 2243 | 2235 | ||
| @@ -2251,7 +2243,6 @@ It should be an integer; only the low 9 bits are used. | |||
| 2251 | 2243 | ||
| 2252 | See also `pr-temp-dir' and `pr-ps-temp-file'." | 2244 | See also `pr-temp-dir' and `pr-ps-temp-file'." |
| 2253 | :type '(integer :tag "File Permission Bits") | 2245 | :type '(integer :tag "File Permission Bits") |
| 2254 | :version "21.3" | ||
| 2255 | :group 'printing) | 2246 | :group 'printing) |
| 2256 | 2247 | ||
| 2257 | 2248 | ||
| @@ -2293,7 +2284,6 @@ Useful links: | |||
| 2293 | `http://www.cs.wisc.edu/~ghost/macos/index.htm' | 2284 | `http://www.cs.wisc.edu/~ghost/macos/index.htm' |
| 2294 | " | 2285 | " |
| 2295 | :type '(string :tag "Ghostview Utility") | 2286 | :type '(string :tag "Ghostview Utility") |
| 2296 | :version "20" | ||
| 2297 | :group 'printing) | 2287 | :group 'printing) |
| 2298 | 2288 | ||
| 2299 | 2289 | ||
| @@ -2320,7 +2310,6 @@ Useful links: | |||
| 2320 | `http://www.cs.wisc.edu/~ghost/doc/printer.htm' | 2310 | `http://www.cs.wisc.edu/~ghost/doc/printer.htm' |
| 2321 | " | 2311 | " |
| 2322 | :type '(string :tag "Ghostscript Utility") | 2312 | :type '(string :tag "Ghostscript Utility") |
| 2323 | :version "20" | ||
| 2324 | :group 'printing) | 2313 | :group 'printing) |
| 2325 | 2314 | ||
| 2326 | 2315 | ||
| @@ -2363,7 +2352,6 @@ Useful links: | |||
| 2363 | `http://www.cs.wisc.edu/~ghost/doc/printer.htm' | 2352 | `http://www.cs.wisc.edu/~ghost/doc/printer.htm' |
| 2364 | " | 2353 | " |
| 2365 | :type '(repeat (string :tag "Ghostscript Switch")) | 2354 | :type '(repeat (string :tag "Ghostscript Switch")) |
| 2366 | :version "20" | ||
| 2367 | :group 'printing) | 2355 | :group 'printing) |
| 2368 | 2356 | ||
| 2369 | 2357 | ||
| @@ -2380,7 +2368,6 @@ A note on the gs switches: | |||
| 2380 | See `pr-gs-switches' for documentation. | 2368 | See `pr-gs-switches' for documentation. |
| 2381 | See also `pr-ps-printer-alist'." | 2369 | See also `pr-ps-printer-alist'." |
| 2382 | :type '(string :tag "Ghostscript Device") | 2370 | :type '(string :tag "Ghostscript Device") |
| 2383 | :version "20" | ||
| 2384 | :group 'printing) | 2371 | :group 'printing) |
| 2385 | 2372 | ||
| 2386 | 2373 | ||
| @@ -2394,7 +2381,6 @@ A note on the gs switches: | |||
| 2394 | See `pr-gs-switches' for documentation. | 2381 | See `pr-gs-switches' for documentation. |
| 2395 | See also `pr-ps-printer-alist'." | 2382 | See also `pr-ps-printer-alist'." |
| 2396 | :type '(integer :tag "Ghostscript Resolution") | 2383 | :type '(integer :tag "Ghostscript Resolution") |
| 2397 | :version "20" | ||
| 2398 | :group 'printing) | 2384 | :group 'printing) |
| 2399 | 2385 | ||
| 2400 | 2386 | ||
| @@ -2407,35 +2393,30 @@ ghostscript to print a PostScript file. | |||
| 2407 | In GNU or Unix system, if ghostscript is set as a PostScript filter, this | 2393 | In GNU or Unix system, if ghostscript is set as a PostScript filter, this |
| 2408 | variable should be nil." | 2394 | variable should be nil." |
| 2409 | :type 'boolean | 2395 | :type 'boolean |
| 2410 | :version "20" | ||
| 2411 | :group 'printing) | 2396 | :group 'printing) |
| 2412 | 2397 | ||
| 2413 | 2398 | ||
| 2414 | (defcustom pr-faces-p nil | 2399 | (defcustom pr-faces-p nil |
| 2415 | "*Non-nil means print with face attributes." | 2400 | "*Non-nil means print with face attributes." |
| 2416 | :type 'boolean | 2401 | :type 'boolean |
| 2417 | :version "20" | ||
| 2418 | :group 'printing) | 2402 | :group 'printing) |
| 2419 | 2403 | ||
| 2420 | 2404 | ||
| 2421 | (defcustom pr-spool-p nil | 2405 | (defcustom pr-spool-p nil |
| 2422 | "*Non-nil means spool printing in a buffer." | 2406 | "*Non-nil means spool printing in a buffer." |
| 2423 | :type 'boolean | 2407 | :type 'boolean |
| 2424 | :version "20" | ||
| 2425 | :group 'printing) | 2408 | :group 'printing) |
| 2426 | 2409 | ||
| 2427 | 2410 | ||
| 2428 | (defcustom pr-file-landscape nil | 2411 | (defcustom pr-file-landscape nil |
| 2429 | "*Non-nil means print PostScript file in landscape orientation." | 2412 | "*Non-nil means print PostScript file in landscape orientation." |
| 2430 | :type 'boolean | 2413 | :type 'boolean |
| 2431 | :version "20" | ||
| 2432 | :group 'printing) | 2414 | :group 'printing) |
| 2433 | 2415 | ||
| 2434 | 2416 | ||
| 2435 | (defcustom pr-file-duplex nil | 2417 | (defcustom pr-file-duplex nil |
| 2436 | "*Non-nil means print PostScript file in duplex mode." | 2418 | "*Non-nil means print PostScript file in duplex mode." |
| 2437 | :type 'boolean | 2419 | :type 'boolean |
| 2438 | :version "20" | ||
| 2439 | :group 'printing) | 2420 | :group 'printing) |
| 2440 | 2421 | ||
| 2441 | 2422 | ||
| @@ -2447,7 +2428,6 @@ right. | |||
| 2447 | If tumble is on, produces a printing suitable for binding at the top or | 2428 | If tumble is on, produces a printing suitable for binding at the top or |
| 2448 | bottom." | 2429 | bottom." |
| 2449 | :type 'boolean | 2430 | :type 'boolean |
| 2450 | :version "20" | ||
| 2451 | :group 'printing) | 2431 | :group 'printing) |
| 2452 | 2432 | ||
| 2453 | 2433 | ||
| @@ -2460,7 +2440,6 @@ When this variable is non-nil, the `*-buffer*' commands will behave like | |||
| 2460 | `*-region*' commands, that is, `*-buffer*' commands will print only the region | 2440 | `*-region*' commands, that is, `*-buffer*' commands will print only the region |
| 2461 | marked instead of all buffer." | 2441 | marked instead of all buffer." |
| 2462 | :type 'boolean | 2442 | :type 'boolean |
| 2463 | :version "20" | ||
| 2464 | :group 'printing) | 2443 | :group 'printing) |
| 2465 | 2444 | ||
| 2466 | 2445 | ||
| @@ -2472,7 +2451,6 @@ and `*-region*' commands will behave like `*-mode*' commands; otherwise, | |||
| 2472 | `*-buffer*' commands will print the current buffer and `*-region*' commands | 2451 | `*-buffer*' commands will print the current buffer and `*-region*' commands |
| 2473 | will print the current region." | 2452 | will print the current region." |
| 2474 | :type 'boolean | 2453 | :type 'boolean |
| 2475 | :version "20" | ||
| 2476 | :group 'printing) | 2454 | :group 'printing) |
| 2477 | 2455 | ||
| 2478 | 2456 | ||
| @@ -2673,7 +2651,6 @@ DEFAULT It's a way to set default values when this entry is selected. | |||
| 2673 | (variable :tag "Other")) | 2651 | (variable :tag "Other")) |
| 2674 | (sexp :tag "Value"))) | 2652 | (sexp :tag "Value"))) |
| 2675 | )) | 2653 | )) |
| 2676 | :version "20" | ||
| 2677 | :group 'printing) | 2654 | :group 'printing) |
| 2678 | 2655 | ||
| 2679 | 2656 | ||
| @@ -2691,7 +2668,6 @@ NOTE: Don't forget to download and install the utilities declared on | |||
| 2691 | `pr-ps-utility-alist'." | 2668 | `pr-ps-utility-alist'." |
| 2692 | :type '(symbol :tag "PS File Utility") | 2669 | :type '(symbol :tag "PS File Utility") |
| 2693 | :set 'pr-ps-utility-custom-set | 2670 | :set 'pr-ps-utility-custom-set |
| 2694 | :version "20" | ||
| 2695 | :group 'printing) | 2671 | :group 'printing) |
| 2696 | 2672 | ||
| 2697 | 2673 | ||
| @@ -2904,7 +2880,6 @@ Useful links: | |||
| 2904 | (sexp :tag "Value"))) | 2880 | (sexp :tag "Value"))) |
| 2905 | )) | 2881 | )) |
| 2906 | :set 'pr-alist-custom-set | 2882 | :set 'pr-alist-custom-set |
| 2907 | :version "20" | ||
| 2908 | :group 'printing) | 2883 | :group 'printing) |
| 2909 | 2884 | ||
| 2910 | 2885 | ||
| @@ -2913,7 +2888,6 @@ Useful links: | |||
| 2913 | 2888 | ||
| 2914 | See also `pr-menu-char-height' and `pr-menu-char-width'." | 2889 | See also `pr-menu-char-height' and `pr-menu-char-width'." |
| 2915 | :type 'boolean | 2890 | :type 'boolean |
| 2916 | :version "20" | ||
| 2917 | :group 'printing) | 2891 | :group 'printing) |
| 2918 | 2892 | ||
| 2919 | 2893 | ||
| @@ -2925,7 +2899,6 @@ menu, so don't forget to adjust it if menu position is not ok. | |||
| 2925 | 2899 | ||
| 2926 | See also `pr-menu-lock' and `pr-menu-char-width'." | 2900 | See also `pr-menu-lock' and `pr-menu-char-width'." |
| 2927 | :type 'integer | 2901 | :type 'integer |
| 2928 | :version "20" | ||
| 2929 | :group 'printing) | 2902 | :group 'printing) |
| 2930 | 2903 | ||
| 2931 | 2904 | ||
| @@ -2937,7 +2910,6 @@ menu, so don't forget to adjust it if menu position is not ok. | |||
| 2937 | 2910 | ||
| 2938 | See also `pr-menu-lock' and `pr-menu-char-height'." | 2911 | See also `pr-menu-lock' and `pr-menu-char-height'." |
| 2939 | :type 'integer | 2912 | :type 'integer |
| 2940 | :version "20" | ||
| 2941 | :group 'printing) | 2913 | :group 'printing) |
| 2942 | 2914 | ||
| 2943 | 2915 | ||
| @@ -3054,7 +3026,6 @@ SETTING It's a cons like: | |||
| 3054 | (variable :tag "Other")) | 3026 | (variable :tag "Other")) |
| 3055 | (sexp :tag "Value"))) | 3027 | (sexp :tag "Value"))) |
| 3056 | )) | 3028 | )) |
| 3057 | :version "20" | ||
| 3058 | :group 'printing) | 3029 | :group 'printing) |
| 3059 | 3030 | ||
| 3060 | 3031 | ||
| @@ -3108,7 +3079,6 @@ Any other value is ignored." | |||
| 3108 | (const postscript-process) | 3079 | (const postscript-process) |
| 3109 | (const printing) | 3080 | (const printing) |
| 3110 | (const help))) | 3081 | (const help))) |
| 3111 | :version "20" | ||
| 3112 | :group 'printing) | 3082 | :group 'printing) |
| 3113 | 3083 | ||
| 3114 | 3084 | ||
| @@ -3120,7 +3090,6 @@ happens when printing: | |||
| 3120 | 3090 | ||
| 3121 | Error: could not open \"c:\\temp\\prspool.ps\" for reading." | 3091 | Error: could not open \"c:\\temp\\prspool.ps\" for reading." |
| 3122 | :type 'boolean | 3092 | :type 'boolean |
| 3123 | :version "20" | ||
| 3124 | :group 'printing) | 3093 | :group 'printing) |
| 3125 | 3094 | ||
| 3126 | 3095 | ||
| @@ -3134,7 +3103,6 @@ It's used by `pr-ps-directory-preview', `pr-ps-directory-using-ghostscript', | |||
| 3134 | `pr-ps-directory-print', `pr-ps-directory-ps-print', `pr-printify-directory' | 3103 | `pr-ps-directory-print', `pr-ps-directory-ps-print', `pr-printify-directory' |
| 3135 | and `pr-txt-directory'." | 3104 | and `pr-txt-directory'." |
| 3136 | :type 'boolean | 3105 | :type 'boolean |
| 3137 | :version "20" | ||
| 3138 | :group 'printing) | 3106 | :group 'printing) |
| 3139 | 3107 | ||
| 3140 | 3108 | ||
| @@ -3143,7 +3111,6 @@ and `pr-txt-directory'." | |||
| 3143 | 3111 | ||
| 3144 | It's used by `pr-interface'." | 3112 | It's used by `pr-interface'." |
| 3145 | :type 'string | 3113 | :type 'string |
| 3146 | :version "20" | ||
| 3147 | :group 'printing) | 3114 | :group 'printing) |
| 3148 | 3115 | ||
| 3149 | 3116 | ||
| @@ -3157,7 +3124,6 @@ NOTE: Case is important for matching, that is, `case-fold-search' is always | |||
| 3157 | 3124 | ||
| 3158 | It's used by `pr-interface'." | 3125 | It's used by `pr-interface'." |
| 3159 | :type '(repeat (regexp :tag "Buffer Name Regexp")) | 3126 | :type '(repeat (regexp :tag "Buffer Name Regexp")) |
| 3160 | :version "20" | ||
| 3161 | :group 'printing) | 3127 | :group 'printing) |
| 3162 | 3128 | ||
| 3163 | 3129 | ||
| @@ -3166,7 +3132,6 @@ It's used by `pr-interface'." | |||
| 3166 | 3132 | ||
| 3167 | It's used by `pr-interface'." | 3133 | It's used by `pr-interface'." |
| 3168 | :type 'boolean | 3134 | :type 'boolean |
| 3169 | :version "20" | ||
| 3170 | :group 'printing) | 3135 | :group 'printing) |
| 3171 | 3136 | ||
| 3172 | 3137 | ||