Renamed `fsf' to `emacs' in all names.

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 35dde7c03d146d5b830a41ee9ee7d65c5d42a8f9..b4f82aaa32e2ce6688a59557523f328dab542582 100644 (file)
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -455,8 +455,8 @@ customizable by changing variables `ps-header-left' and
 Note: page numbers are displayed as part of headers, see variable
 `ps-print-headers'.")
 
-(defvar ps-print-color-p (and (or (fboundp 'x-color-values)   ; fsf
-                               (fboundp 'pixel-components))  ; xemacs
+(defvar ps-print-color-p (and (or (fboundp 'x-color-values)   ; Emacs
+                               (fboundp 'pixel-components))  ; XEmacs
                              (fboundp 'float))
 ; Printing color requires both floating point and x-color-values.
   "*If non-nil, print the buffer's text in color.")
@@ -711,7 +711,7 @@ number, prompt the user for the name of the file to save in."
   (defvar emacs-type (cond ((string-match "XEmacs" emacs-version) 'xemacs)
                           ((string-match "Lucid" emacs-version) 'lucid)
                           ((string-match "Epoch" emacs-version) 'epoch)
-                          (t 'fsf))))
+                          (t 'emacs))))
 
 (if (or (eq emacs-type 'lucid)
        (eq emacs-type 'xemacs))
@@ -1104,7 +1104,7 @@ StandardEncoding 46 82 getinterval aload pop
 
 (defvar ps-razchunk 0)
 
-(defvar ps-color-format (if (eq emacs-type 'fsf)
+(defvar ps-color-format (if (eq emacs-type 'emacs)
 
                            ;;Emacs understands the %f format; we'll
                            ;;use it to limit color RGB values to
@@ -1613,7 +1613,7 @@ EndDSCPage\n"))
     (goto-char to)))
 
 
-(defun ps-fsf-face-kind-p (face kind kind-regex kind-list)
+(defun ps-emacs-face-kind-p (face kind kind-regex kind-list)
   (let ((frame-font (face-font face))
        (face-defaults (face-font face t)))
     (or
@@ -1635,15 +1635,15 @@ EndDSCPage\n"))
        (memq face kind-list))))
 
 (defun ps-face-bold-p (face)
-  (if (eq emacs-type 'fsf)
-      (ps-fsf-face-kind-p face 'bold "-\\(bold\\|demibold\\)-"
+  (if (eq emacs-type 'emacs)
+      (ps-emacs-face-kind-p face 'bold "-\\(bold\\|demibold\\)-"
                          ps-bold-faces)
     (ps-xemacs-face-kind-p face 'WEIGHT_NAME "bold\\|demibold"
                           ps-bold-faces)))
 
 (defun ps-face-italic-p (face)
-  (if (eq emacs-type 'fsf)
-      (ps-fsf-face-kind-p face 'italic "-[io]-" ps-italic-faces)
+  (if (eq emacs-type 'emacs)
+      (ps-emacs-face-kind-p face 'italic "-[io]-" ps-italic-faces)
     (or
      (ps-xemacs-face-kind-p face 'ANGLE_NAME "i\\|o" ps-italic-faces)
      (ps-xemacs-face-kind-p face 'SLANT "i\\|o" ps-italic-faces))))
@@ -1767,7 +1767,7 @@ EndDSCPage\n"))
               (setq from position)
               (setq a (cdr a)))))
 
-           ((eq emacs-type 'fsf)
+           ((eq emacs-type 'emacs)
             (let ((property-change from)
                   (overlay-change from))
               (while (< from to)
@@ -1924,10 +1924,10 @@ EndDSCPage\n"))
 ;; WARNING!!! The following code is *sample* code only. Don't use it
 ;; unless you understand what it does!
 
-(defmacro ps-prsc () (list 'if (list 'eq 'emacs-type ''fsf) [f22] ''f22))
-(defmacro ps-c-prsc () (list 'if (list 'eq 'emacs-type ''fsf) [C-f22]
+(defmacro ps-prsc () (list 'if (list 'eq 'emacs-type ''emacs) [f22] ''f22))
+(defmacro ps-c-prsc () (list 'if (list 'eq 'emacs-type ''emacs) [C-f22]
                             ''(control f22)))
-(defmacro ps-s-prsc () (list 'if (list 'eq 'emacs-type ''fsf) [S-f22]
+(defmacro ps-s-prsc () (list 'if (list 'eq 'emacs-type ''emacs) [S-f22]
                             ''(shift f22)))
 
 ;; Look in an article or mail message for the Subject: line.  To be