HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix link errors in the Mac OS build that were caused by variables being marked as...
[bpt/emacs.git]
/
lisp
/
ps-print.el
diff --git
a/lisp/ps-print.el
b/lisp/ps-print.el
index
25cb9ca
..
b51eb94
100644
(file)
--- a/
lisp/ps-print.el
+++ b/
lisp/ps-print.el
@@
-1,8
+1,6
@@
;;; ps-print.el --- print text from the buffer as PostScript
;;; ps-print.el --- print text from the buffer as PostScript
-;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1993-2011 Free Software Foundation, Inc.
;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
;; Jacques Duthen (was <duthen@cegelec-red.fr>)
;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
;; Jacques Duthen (was <duthen@cegelec-red.fr>)
@@
-1466,12
+1464,9
@@
Please send all bug fixes and enhancements to
(require 'lpr)
(require 'lpr)
-(or (featurep 'lisp-float-type)
- (error "`ps-print' requires floating point support"))
-
-
(if (featurep 'xemacs)
(if (featurep 'xemacs)
- ()
+ (or (featurep 'lisp-float-type)
+ (error "`ps-print' requires floating point support"))
(unless (and (boundp 'emacs-major-version)
(>= emacs-major-version 23))
(error "`ps-print' only supports Emacs 23 and higher")))
(unless (and (boundp 'emacs-major-version)
(>= emacs-major-version 23))
(error "`ps-print' only supports Emacs 23 and higher")))
@@
-1484,7
+1479,7
@@
Please send all bug fixes and enhancements to
;; Load XEmacs/Emacs definitions
;; Load XEmacs/Emacs definitions
-(
eval-and-compile (require 'ps-def)
)
+(
require 'ps-def
)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@
-1497,7
+1492,7
@@
Please send all bug fixes and enhancements to
"Support for printing and PostScript."
:tag "PostScript"
:version "20"
"Support for printing and PostScript."
:tag "PostScript"
:version "20"
- :group 'e
macs
)
+ :group 'e
xternal
)
(defgroup ps-print nil
"PostScript generator for Emacs."
(defgroup ps-print nil
"PostScript generator for Emacs."
@@
-6650,7
+6645,8
@@
If FACE is not a valid face name, use default face."
(error "Unprinted PostScript"))))
(cond ((fboundp 'add-hook)
(error "Unprinted PostScript"))))
(cond ((fboundp 'add-hook)
- (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check))
+ (unless noninteractive
+ (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check)))
(kill-emacs-hook
(message "Won't override existing `kill-emacs-hook'"))
(t
(kill-emacs-hook
(message "Won't override existing `kill-emacs-hook'"))
(t
@@
-6662,7
+6658,7
@@
If FACE is not a valid face name, use default face."
;; But autoload them here to make the separation invisible.
\f
;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
;; But autoload them here to make the separation invisible.
\f
;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "
7fadcd6c4b18087e900bd21e6da5e854
")
+;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "
14536f28e0dcaa956901bb59ad86a875
")
;;; Generated autoloads from ps-mule.el
(defvar ps-multibyte-buffer nil "\
;;; Generated autoloads from ps-mule.el
(defvar ps-multibyte-buffer nil "\