Merge from trunk; add Bug#.

[gnu-emacs] / lisp / progmodes / ps-mode.el

diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index cade56a194c587295dad82f4477fc35d65877ab8..bf52eff8f9a17b0ccde113d107e0a2af903a03f6 100644 (file)
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -1,6 +1,6 @@
 ;;; ps-mode.el --- PostScript mode for GNU Emacs
 
 ;;; ps-mode.el --- PostScript mode for GNU Emacs
 

-;; Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.

 
 ;; Author:     Peter Kleiweg <p.c.j.kleiweg@rug.nl>
 ;; Maintainer: Peter Kleiweg <p.c.j.kleiweg@rug.nl>
 
 ;; Author:     Peter Kleiweg <p.c.j.kleiweg@rug.nl>
 ;; Maintainer: Peter Kleiweg <p.c.j.kleiweg@rug.nl>


@@ -60,17 +60,17 @@
 ;; User variables.
 
 (defcustom ps-mode-auto-indent t
 ;; User variables.
 
 (defcustom ps-mode-auto-indent t

-  "*Should we use autoindent?"
+  "Should we use autoindent?"

   :group 'PostScript-edit
   :type 'boolean)
 
 (defcustom ps-mode-tab 4
   :group 'PostScript-edit
   :type 'boolean)
 
 (defcustom ps-mode-tab 4

-  "*Number of spaces to use when indenting."
+  "Number of spaces to use when indenting."

   :group 'PostScript-edit
   :type 'integer)
 
 (defcustom ps-mode-paper-size '(595 842)
   :group 'PostScript-edit
   :type 'integer)
 
 (defcustom ps-mode-paper-size '(595 842)

-  "*Default paper size.
+  "Default paper size.

 
 When inserting an EPSF template these values are used
 to set the boundingbox to include the whole page.
 
 When inserting an EPSF template these values are used
 to set the boundingbox to include the whole page.


@@ -117,12 +117,12 @@ When the figure is finished these values should be replaced."
           (lpr-command (if (memq system-type '(usg-unix-v hpux irix))
                            "lp" "lpr")))
        (lpr-buffer)))
           (lpr-command (if (memq system-type '(usg-unix-v hpux irix))
                            "lp" "lpr")))
        (lpr-buffer)))

-  "*Lisp function to print current buffer as PostScript."
+  "Lisp function to print current buffer as PostScript."

   :group 'PostScript-edit
   :type 'function)
 
 (defcustom ps-run-prompt "\\(GS\\(<[0-9]+\\)?>\\)+"
   :group 'PostScript-edit
   :type 'function)
 
 (defcustom ps-run-prompt "\\(GS\\(<[0-9]+\\)?>\\)+"

-  "*Regexp to match prompt in interactive PostScript."
+  "Regexp to match prompt in interactive PostScript."

   :group 'PostScript-interaction
   :type 'regexp)
 
   :group 'PostScript-interaction
   :type 'regexp)
 


@@ -139,7 +139,7 @@ When the figure is finished these values should be replaced."
            ("^\\(Current file position is\\) \\([0-9]+\\)"
             (1 font-lock-comment-face nil nil)
             (2 font-lock-warning-face nil nil))))
            ("^\\(Current file position is\\) \\([0-9]+\\)"
             (1 font-lock-comment-face nil nil)
             (2 font-lock-warning-face nil nil))))

-  "*Medium level highlighting of messages from the PostScript interpreter.
+  "Medium level highlighting of messages from the PostScript interpreter.

 
 See documentation on font-lock for details."
   :group 'PostScript-interaction
 
 See documentation on font-lock for details."
   :group 'PostScript-interaction


@@ -155,17 +155,17 @@ See documentation on font-lock for details."
                                     (boolean :tag "Laxmatch" :value t))))))
 
 (defcustom ps-run-x '("gs" "-r72" "-sPAPERSIZE=a4")
                                     (boolean :tag "Laxmatch" :value t))))))
 
 (defcustom ps-run-x '("gs" "-r72" "-sPAPERSIZE=a4")

-  "*Command as list to run PostScript with graphic display."
+  "Command as list to run PostScript with graphic display."

   :group 'PostScript-interaction
   :type '(repeat string))
 
 (defcustom ps-run-dumb '("gs" "-dNODISPLAY")
   :group 'PostScript-interaction
   :type '(repeat string))
 
 (defcustom ps-run-dumb '("gs" "-dNODISPLAY")

-  "*Command as list to run PostScript without graphic display."
+  "Command as list to run PostScript without graphic display."

   :group 'PostScript-interaction
   :type '(repeat string))
 
 (defcustom ps-run-init nil
   :group 'PostScript-interaction
   :type '(repeat string))
 
 (defcustom ps-run-init nil

-  "*String of commands to send to PostScript to start interactive.
+  "String of commands to send to PostScript to start interactive.

 
 Example: \"executive\"
 
 
 Example: \"executive\"
 


@@ -174,13 +174,13 @@ You won't need to set this option for Ghostscript."
   :type '(choice (const nil) string))
 
 (defcustom ps-run-error-line-numbers nil
   :type '(choice (const nil) string))
 
 (defcustom ps-run-error-line-numbers nil

-  "*What values are used by the PostScript interpreter in error messages?"
+  "What values are used by the PostScript interpreter in error messages?"

   :group 'PostScript-interaction
   :type '(choice (const :tag "line numbers" t)
                  (const :tag "byte counts" nil)))
 
 (defcustom ps-run-tmp-dir nil
   :group 'PostScript-interaction
   :type '(choice (const :tag "line numbers" t)
                  (const :tag "byte counts" nil)))
 
 (defcustom ps-run-tmp-dir nil

-  "*Name of directory to place temporary file.
+  "Name of directory to place temporary file.

 If nil, use `temporary-file-directory'."
   :group 'PostScript-interaction
   :type '(choice (const nil) directory))
 If nil, use `temporary-file-directory'."
   :group 'PostScript-interaction
   :type '(choice (const nil) directory))


@@ -267,7 +267,7 @@ If nil, use `temporary-file-directory'."
       . (1 font-lock-function-name-face))
     '("/\\w+" . font-lock-variable-name-face)
     (cons ps-mode-operators 'font-lock-keyword-face)))
       . (1 font-lock-function-name-face))
     '("/\\w+" . font-lock-variable-name-face)
     (cons ps-mode-operators 'font-lock-keyword-face)))

-  "High level highliting for PostScript mode.")
+  "High level highlighting for PostScript mode.")

 
 (defconst ps-mode-font-lock-keywords ps-mode-font-lock-keywords-1
   "Default expressions to highlight in PostScript mode.")
 
 (defconst ps-mode-font-lock-keywords ps-mode-font-lock-keywords-1
   "Default expressions to highlight in PostScript mode.")


@@ -485,7 +485,7 @@ If nil, use `temporary-file-directory'."
 ;; PostScript mode.
 
 ;;;###autoload
 ;; PostScript mode.
 
 ;;;###autoload

-(define-derived-mode ps-mode fundamental-mode "PostScript"
+(define-derived-mode ps-mode prog-mode "PostScript"

   "Major mode for editing PostScript with GNU Emacs.
 
 Entry to this mode calls `ps-mode-hook'.
   "Major mode for editing PostScript with GNU Emacs.
 
 Entry to this mode calls `ps-mode-hook'.


@@ -624,7 +624,7 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number
 (defun ps-mode-target-column ()
   "To what column should text on current line be indented?
 
 (defun ps-mode-target-column ()
   "To what column should text on current line be indented?
 

-Identation is increased if the last token on the current line
+Indentation is increased if the last token on the current line

 defines the beginning of a group. These tokens are:  {  [  <<"
   (save-excursion
     (beginning-of-line)
 defines the beginning of a group. These tokens are:  {  [  <<"
   (save-excursion
     (beginning-of-line)


@@ -713,7 +713,7 @@ defines the beginning of a group. These tokens are:  {  [  <<"
   (ps-mode-r-balance ">>"))
 
 (defun ps-mode-r-balance (right)
   (ps-mode-r-balance ">>"))
 
 (defun ps-mode-r-balance (right)

-  "Adjust indentification if point after RIGHT."
+  "Adjust indenting if point after RIGHT."

   (if ps-mode-auto-indent
       (save-excursion
        (when (re-search-backward (concat "^[ \t]*" (regexp-quote right) "\\=") nil t)
   (if ps-mode-auto-indent
       (save-excursion
        (when (re-search-backward (concat "^[ \t]*" (regexp-quote right) "\\=") nil t)