emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/gnuplot 8f2ddd0 148/184: untabify


From: ELPA Syncer
Subject: [nongnu] elpa/gnuplot 8f2ddd0 148/184: untabify
Date: Sun, 29 Aug 2021 11:03:33 -0400 (EDT)

branch: elpa/gnuplot
commit 8f2ddd0df772368add7dda5b1c6ac60ac48f976d
Author: conao3 <conao3@gmail.com>
Commit: conao3 <conao3@gmail.com>

    untabify
---
 gnuplot-context.el | 218 +++++++++++++++----------------
 gnuplot-gui.el     |  24 ++--
 gnuplot.el         | 368 ++++++++++++++++++++++++++---------------------------
 3 files changed, 305 insertions(+), 305 deletions(-)

diff --git a/gnuplot-context.el b/gnuplot-context.el
index 7a9f761..7b067b7 100644
--- a/gnuplot-context.el
+++ b/gnuplot-context.el
@@ -106,30 +106,30 @@
 ;; notation as follows:
 ;;
 ;;    any
-;;     Match any token
+;;      Match any token
 ;;
 ;;    name, number, string, separator
-;;     Match a token of the given type.  "Separator" is semicolon, the
-;;     statement separator.
+;;      Match a token of the given type.  "Separator" is semicolon, the
+;;      statement separator.
 ;;
 ;;    Any other symbol
-;;     Match another named rule in the grammar.  May be recursive.
+;;      Match another named rule in the grammar.  May be recursive.
 ;;
 ;;    "STRING"
-;;     Match literally: a token with exactly the text "STRING".
+;;      Match literally: a token with exactly the text "STRING".
 ;;
 ;;   (kw KEYWORD ALIASES ...)
-;;     Match abbreviated Gnuplot keywords.  KEYWORD can be a string or
-;;     a cons (PREFIX . SUFFIX).  In the latter case, this pattern
-;;     will match PREFIX plus any number of characters from the
-;;     beginning of SUFFIX.  Any literal string from ALIASES will
-;;     also match.  The token-id of the matching token is mutated to
-;;     the canonical value of KEYWORD.
-;;     Example:
-;;      (kw ("linew" ."idth") "lw") matches "linew", "linewi",
-;;     ... "linewidth" as well as "lw".  Any of these tokens will
-;;     appear as "linewidth" in subsequent processing.  (This is
-;;     important for the "info-keyword" form, see below).
+;;  Match abbreviated Gnuplot keywords.  KEYWORD can be a string or
+;;  a cons (PREFIX . SUFFIX).  In the latter case, this pattern
+;;  will match PREFIX plus any number of characters from the
+;;  beginning of SUFFIX.  Any literal string from ALIASES will
+;;  also match.  The token-id of the matching token is mutated to
+;;  the canonical value of KEYWORD.
+;;  Example:
+;;   (kw ("linew" ."idth") "lw") matches "linew", "linewi",
+;;  ... "linewidth" as well as "lw".  Any of these tokens will
+;;  appear as "linewidth" in subsequent processing.  (This is
+;;  important for the "info-keyword" form, see below).
 ;;
 ;; The other pattern forms combine simpler patterns, much like regular
 ;; expressions or PEGs (parsing expression grammars):
@@ -137,48 +137,48 @@
 ;;    (sequence { (:eldoc "eldoc string") }
 ;;              { (:info "info page") }
 ;;              { (:no-info) }
-;;          PATTERN PATTERN... )
-;;     Match all the PATTERNs in sequence or fail.  Sequences can also
-;;     have optional ElDoc strings and info pages associated with
-;;     them; the innermost ElDoc or info page around point is the one
-;;     shown to the user.  Alternatively, either property may be a
-;;     symbol, which should be a function to be called to get the
-;;     real value.  Finally, if no ElDoc string is specified but the
-;;     variable `gnuplot-eldoc-hash' contains a value for the name of
-;;     the info page at point, that value is used as the ElDoc string
-;;     instead.
+;;           PATTERN PATTERN... )
+;;      Match all the PATTERNs in sequence or fail.  Sequences can also
+;;      have optional ElDoc strings and info pages associated with
+;;      them; the innermost ElDoc or info page around point is the one
+;;      shown to the user.  Alternatively, either property may be a
+;;      symbol, which should be a function to be called to get the
+;;      real value.  Finally, if no ElDoc string is specified but the
+;;      variable `gnuplot-eldoc-hash' contains a value for the name of
+;;      the info page at point, that value is used as the ElDoc string
+;;      instead.
 ;;
-;;     For better readability, sequence forms can also be written as
-;;     a vector, omitting the `sequence': [PATTERN PATTERN ...]
+;;  For better readability, sequence forms can also be written as
+;;  a vector, omitting the `sequence': [PATTERN PATTERN ...]
 ;;
 ;;    (either PATTERN PATTERN...)
-;;     Match the first PATTERN to succeed, or fail if none
-;;     matches.  Like regexp `|'.
+;;      Match the first PATTERN to succeed, or fail if none
+;;      matches.  Like regexp `|'.
 ;;
 ;;    (many PATTERN)
-;;     Match PATTERN zero or more times, greedily; like regexp
-;;     `*'.  Unlike a regular expression matcher, the parsing machine
-;;     will not backtrack and try to match fewer times if a later
-;;     part of the pattern fails.  This applies equally to the other
-;;     non-deterministic forms "either" and "maybe".
+;;  Match PATTERN zero or more times, greedily; like regexp
+;;  `*'.  Unlike a regular expression matcher, the parsing machine
+;;  will not backtrack and try to match fewer times if a later
+;;  part of the pattern fails.  This applies equally to the other
+;;  non-deterministic forms "either" and "maybe".
 ;;
 ;;    (maybe PATTERN)
-;;     Match PATTERN zero or one times, like regexp `?'.
+;;      Match PATTERN zero or one times, like regexp `?'.
 ;;
 ;;    (capture NAME PATTERN)
-;;     Match PATTERN, capturing the tokens in a capture group named
-;;     NAME.  Capture groups are stored in `gnuplot-captures'
-;;     and can be retrieved using `gnuplot-capture-group'.  This is
-;;     used to store the plotting style, which we need in order to
-;;     give the correct ElDoc string for "using" clauses, and for
-;;     info keywords (see below)
+;;      Match PATTERN, capturing the tokens in a capture group named
+;;      NAME.  Capture groups are stored in `gnuplot-captures'
+;;      and can be retrieved using `gnuplot-capture-group'.  This is
+;;      used to store the plotting style, which we need in order to
+;;      give the correct ElDoc string for "using" clauses, and for
+;;      info keywords (see below)
 ;;
 ;;    (info-keyword PATTERN)
-;;     Match PATTERN, and use whatever the value of the first token
-;;     it matches is to look up info pages for this pattern.  Most
-;;     Gnuplot info pages have the same name as the keyword they
-;;     document, so by using this we only have to put :info
-;;     properties on the few that don't, such as "set".
+;;      Match PATTERN, and use whatever the value of the first token
+;;      it matches is to look up info pages for this pattern.  Most
+;;      Gnuplot info pages have the same name as the keyword they
+;;      document, so by using this we only have to put :info
+;;      properties on the few that don't, such as "set".
 ;;
 ;;    For convenience, "many", "maybe", "capture" and "info-keyword"
 ;;    wrap the rest of their arguments in an implicit "sequence" form,
@@ -186,14 +186,14 @@
 ;;    (maybe (sequence "," expression))
 ;;
 ;;    (delimited-list PATTERN SEPARATOR)
-;;     Match a list of PATTERNs separated by SEPARATOR.  Sugar for:
-;;     (sequence PATTERN (many (sequence SEPARATOR PATTERN)))
+;;      Match a list of PATTERNs separated by SEPARATOR.  Sugar for:
+;;      (sequence PATTERN (many (sequence SEPARATOR PATTERN)))
 ;;
 ;;   (assert LISP-FORM)
-;;     Evaluate LISP-FORM and fail if it returns NIL.  We need this in
-;;     the patterns for "plot" and "splot" to check whether the
-;;     command at point should be parsed in parametric mode or
-;;     not.  See `gnuplot-guess-parametric-p'.
+;;  Evaluate LISP-FORM and fail if it returns NIL.  We need this in
+;;  the patterns for "plot" and "splot" to check whether the
+;;  command at point should be parsed in parametric mode or
+;;  not.  See `gnuplot-guess-parametric-p'.
 ;;
 ;;
 ;; Bugs, TODOs, etc.
@@ -251,10 +251,10 @@
 ;;;; The tokenizer.
 
 (defstruct gnuplot-token
-  start            ; Buffer start position
-  end      ; Buffer end position
-  id       ; Text
-  type)            ; a symbol: name, number, string, operator, separator
+  start         ; Buffer start position
+  end       ; Buffer end position
+  id        ; Text
+  type)         ; a symbol: name, number, string, operator, separator
 
 (defvar gnuplot-operator-regexp
   (eval-when-compile
@@ -353,41 +353,41 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
 ;; instructions" are the following:
 ;;
 ;;    (any)
-;;     Match any token (fails only at end of command).
+;;      Match any token (fails only at end of command).
 ;;
 ;;    (literal LITERAL NO-COMPLETE)
-;;     Match token with `gnuplot-token-id' LITERAL or fail. If we
-;;     have reached the token before point, include LITERAL in the
-;;     completion list unless NO-COMPLETE is non-`nil'.
+;;      Match token with `gnuplot-token-id' LITERAL or fail. If we
+;;      have reached the token before point, include LITERAL in the
+;;      completion list unless NO-COMPLETE is non-`nil'.
 ;;
 ;;    (token-type TYPE)
-;;     Match a token with `gnuplot-token-type' TYPE, or fail.
+;;      Match a token with `gnuplot-token-type' TYPE, or fail.
 ;;
 ;;    (keyword REGEXP NAME)
-;;     Match any token whose `gnuplot-token-id' matches REGEXP. Use
-;;     NAME for the completion list.
+;;      Match any token whose `gnuplot-token-id' matches REGEXP. Use
+;;      NAME for the completion list.
 ;;
 ;;    (jump OFFSET FIXED)
-;;     Jump to (set PC to) OFFSET if FIXED is non-nil, otherwise to
-;;     PC + OFFSET
+;;      Jump to (set PC to) OFFSET if FIXED is non-nil, otherwise to
+;;      PC + OFFSET
 ;;
 ;;    (call OFFSET FIXED)
-;;     Like "jump", but push a return address onto the stack for
-;;     (return). (The compiler adds the name of the rule being called
-;;     as a fourth element on the end of the list, but this is just a
-;;     comment for debugging purposes).
+;;      Like "jump", but push a return address onto the stack for
+;;      (return). (The compiler adds the name of the rule being called
+;;      as a fourth element on the end of the list, but this is just a
+;;      comment for debugging purposes).
 ;;
 ;;    (return)
-;;     Return to the PC address on top of the stack, or finish
-;;     matching if stack is empty. (Usually this doesn't happen,
-;;     because the machine stops as soon as it gets to the token at
-;;     point).
+;;      Return to the PC address on top of the stack, or finish
+;;      matching if stack is empty. (Usually this doesn't happen,
+;;      because the machine stops as soon as it gets to the token at
+;;      point).
 ;;
 ;;    (choice OFFSET)
-;;     Push a backtracking entry for location PC + OFFSET onto the
-;;     backtracking stack. Backtracking entries save the contents of
-;;     the call stack, position in the token list, the values of
-;;     capture groups, and the record of loop progress (see below).
+;;      Push a backtracking entry for location PC + OFFSET onto the
+;;      backtracking stack. Backtracking entries save the contents of
+;;      the call stack, position in the token list, the values of
+;;      capture groups, and the record of loop progress (see below).
 ;;
 ;;    (check-progress)
 ;;      Break out of infinite loops, like (many (many ...)).  Checks
@@ -397,38 +397,38 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
 ;;      new entry onto the list.
 ;;
 ;;    (fail)
-;;     Pop the most recent backtracking entry and continue from
-;;     there, or fail the whole match if out of backtrack
-;;     points. Failing to match returns the remainder of the token
-;;     list, although we don't currently use this for anything.
+;;      Pop the most recent backtracking entry and continue from
+;;      there, or fail the whole match if out of backtrack
+;;      points. Failing to match returns the remainder of the token
+;;      list, although we don't currently use this for anything.
 ;;
 ;;    (commit OFFSET)
-;;     Discard one backtracking point and jump to PC + OFFSET. This
-;;     is used to make the (either) form non-deterministic.
+;;      Discard one backtracking point and jump to PC + OFFSET. This
+;;      is used to make the (either) form non-deterministic.
 ;;
 ;;    (push TYPE VALUE)
-;;     Push an entry for an eldoc or info string (specified by TYPE)
-;;     onto the stack.
+;;      Push an entry for an eldoc or info string (specified by TYPE)
+;;      onto the stack.
 ;;
 ;;    (pop TYPE)
-;;     Pop something off the stack; checks that it has the expected
-;;     TYPE, for safety.
+;;      Pop something off the stack; checks that it has the expected
+;;      TYPE, for safety.
 ;;
 ;;    (save-start NAME)
-;;     Open a capture group named NAME. Pushes an entry onto
-;;     `gnuplot-captures' with current position in token list as the
-;;     start of the group.
+;;      Open a capture group named NAME. Pushes an entry onto
+;;      `gnuplot-captures' with current position in token list as the
+;;      start of the group.
 ;;
 ;;    (save-end NAME)
-;;     Close the capture group named NAME. Finds the topmost entry in
-;;     `gnuplot-captures' with this name and sets its endpoint to the
-;;     current position in token list. Error if no group with that
-;;     name is found.
+;;      Close the capture group named NAME. Finds the topmost entry in
+;;      `gnuplot-captures' with this name and sets its endpoint to the
+;;      current position in token list. Error if no group with that
+;;      name is found.
 ;;
 ;;    (label NAME)
-;;     This should never be reached and will cause an error. The
-;;     compiler inserts it at the beginning of compiled rules only
-;;     for debugging purposes.
+;;      This should never be reached and will cause an error. The
+;;      compiler inserts it at the beginning of compiled rules only
+;;      for debugging purposes.
 ;;
 
 
@@ -490,13 +490,13 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
           ;; (either...): choose between patterns
           ((either)
            (cond
-            ((= (length pat) 2)                ; trivial case
+            ((= (length pat) 2)         ; trivial case
              (gnuplot-compile-pattern (cadr pat)))
 
-            ((> (length pat) 3)                ; could be more efficient...
+            ((> (length pat) 3)         ; could be more efficient...
              (gnuplot-compile-pattern (gnuplot-either-helper pat)))
 
-            (t                         ; two patterns
+            (t              ; two patterns
              (let* ((pat1 (cadr pat))
                     (pat2 (caddr pat))
                     (pat1-c (gnuplot-compile-pattern pat1))
@@ -514,7 +514,7 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
                   (pat1-c (gnuplot-compile-pattern pat1))
                   (pat1-l (length pat1-c)))
              `((choice ,(+ pat1-l 3))
-               (check-progress)                ; bail out of infinite loops
+               (check-progress)         ; bail out of infinite loops
                ,@pat1-c
                (commit ,(- (+ pat1-l 2))))))
 
@@ -618,7 +618,7 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
   ;; each pattern individually, then "links" them into one vector,
   ;; converting symbolic (call ...) instructions into numeric offsets
   (defun gnuplot-compile-grammar (grammar start-symbol)
-    (let ((compiled-pats '())        ; Alist of (name . instructions)
+    (let ((compiled-pats '())         ; Alist of (name . instructions)
           ;; Reserve space for a jump to the start symbol
           (code-length 1))
 
@@ -1236,7 +1236,7 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
 
          (set-dgrid3d-clause
           ["dgrid3d"
-           (maybe expression)          ; fixme
+           (maybe expression)       ; fixme
            (maybe "," expression)
            (either
             "splines"
@@ -1445,7 +1445,7 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
              "gray" "color"
              ["gamma" number]
              ["rgbformulae" number "," number "," number]
-             "defined"                 ; not complete
+             "defined"          ; not complete
              ["functions" expression "," expression "," expression]
              ["file" string (many datafile-modifier)]
              "RGB" "HSV" "CMY" "YIQ" "XYZ"
@@ -1547,7 +1547,7 @@ name; otherwise continues tokenizing up to the token at 
point.  FIXME."
 
          (set-table-clause ["table" (maybe string)])
 
-         (set-terminal-clause          ; not sure how to do this...
+         (set-terminal-clause       ; not sure how to do this...
           ["terminal" (maybe (either "push" "pop"))])
 
          (set-termoption-clause
@@ -1780,7 +1780,7 @@ nil, it parses up to the token at point and sets 
`gnuplot-eldoc'
 and `gnuplot-info-at-point' based on the contents of the stack
 there."
   (catch 'return
-    (let ((pc 0)                       ; Program counter
+    (let ((pc 0)            ; Program counter
           ;; Stack of return addresses (return PC), eldoc strings
           ;; (eldoc STRING) and info pages (info STRING)
           (stack '())
@@ -1797,7 +1797,7 @@ there."
 
       (with-gnuplot-trace-buffer (erase-buffer))
 
-      (when start-symbol               ; HACK FIXME
+      (when start-symbol        ; HACK FIXME
         (let ((look-for `(label ,start-symbol)))
           (while (not (equal (aref instructions pc) look-for))
             (incf pc))
@@ -1972,7 +1972,7 @@ there."
 
             ;; Backtrack on failure
             (when fail
-              (if (not backtrack)      ; Out of backtracking stack: failed 
match
+              (if (not backtrack)   ; Out of backtracking stack: failed match
                   (throw 'return nil)
                 (gnuplot-trace "\t*fail*\t%s\n" (length backtrack))
                 (gnuplot-debug (gnuplot-dump-backtrack backtrack))
diff --git a/gnuplot-gui.el b/gnuplot-gui.el
index 52e28d4..a3eb4e0 100644
--- a/gnuplot-gui.el
+++ b/gnuplot-gui.el
@@ -73,7 +73,7 @@
         (require 'wid-edit))
     (error nil)))
 (require 'cl)
-(eval-when-compile                     ; suppress some compiler warnings
+(eval-when-compile          ; suppress some compiler warnings
   (defvar gnuplot-xemacs-p nil)
   (defvar gnuplot-quote-character nil)
   (defvar gnuplot-info-display nil)
@@ -82,7 +82,7 @@
 ;; (eval-when-compile
 ;;   (require 'wid-edit))
 
-(eval-and-compile                      ; I need this!
+(eval-and-compile           ; I need this!
   (if (fboundp 'split-string)
       ()
     (defun split-string (string &optional pattern)
@@ -326,7 +326,7 @@ See the doc-string for `gnuplot-gui-all-types'.")
                   '(("POINTSIZE"        'number " ")
                     ("LINEWIDTH"        'number " ")
                     ("INTERVAL "        'number " ")))
-            (cons "vgagl"              ; for pm3d patch (also persist, raise 
in x11) <MT>
+            (cons "vgagl"       ; for pm3d patch (also persist, raise in x11) 
<MT>
                   '(("BACKGROUND"       'position  " " "background" 3)
                     ("INTERPOLATION"    'list " " "uniform" "interpolate")
                     ("DUMP"             'file " ")
@@ -838,8 +838,8 @@ The value of REST depends upon TYPE:
 Here is an example entry for the png terminal type:
 
   (cons \"png\"
-       '((\"SIZE\"  'list \" \" \"small\" \"medium\" \"large\")
-         (\"COLOR\" 'list \" \" \"monochrome\" \"gray\" \"color\")))
+    '((\"SIZE\"  'list \" \" \"small\" \"medium\" \"large\")
+      (\"COLOR\" 'list \" \" \"monochrome\" \"gray\" \"color\")))
 
 This alist is formed at load time by appending together
 `gnuplot-gui-terminal-types', `gnuplot-gui-set-types' and
@@ -1030,10 +1030,10 @@ from the list and concatenates the strings that are 
part of a quoted
 argument, for example an axis label or a font name.  It also replaces
 bounding single quotes with double quotes, since double quotes are
 used in `gnuplot-gui-all-types'."
-  (let (fixed-list quote quoted)       ; remove blanks
+  (let (fixed-list quote quoted)    ; remove blanks
     (setq list (remove* "\\s-+" list :test 'string-match)
           list (remove* ""      list :test 'string=))
-    (while list                                ; concatinate parts of quoted 
string
+    (while list             ; concatinate parts of quoted string
       (if (not (string-match "^\\([\]\[()'\"]\\)" (car list)))
           (setq fixed-list (append fixed-list (list (car list))))
         (setq quote (match-string 1 (car list))
@@ -1074,7 +1074,7 @@ arguments."
                                (cons tag (cons (car default) (cdr default))))
                               (t (cons tag default))))
              (temp-list arg-list) )
-        ;;(message "%S" temp-list)     ; want to lop values off arg-list
+        ;;(message "%S" temp-list)  ; want to lop values off arg-list
                                         ; as they are found
         (if (symbolp (cadr values))
             (setq values (symbol-value (cadr values))))
@@ -1138,9 +1138,9 @@ arguments."
            ;; ---------------------------- range
            ((equal symbol 'range)
             (if (string-match (concat "\\[\\s-*" ; opening bracket
-                                      "\\([^:, \t]*\\)"        ; first argument
+                                      "\\([^:, \t]*\\)" ; first argument
                                       "\\s-*[:,]\\s-*" ; separator
-                                      "\\([^\] \t]*\\)"        ; second 
argument
+                                      "\\([^\] \t]*\\)" ; second argument
                                       "\\s-*\\]") ; closing bracket
                               (car temp-list))
                 (setq this-cons
@@ -1328,7 +1328,7 @@ SAVE-FRAME is non-nil when the widgets are being reset."
            (list    (gnuplot-gui-type-list   this)))
       (if (symbolp (cadr list))
           (setq list (symbol-value (cadr list))))
-      (widget-insert "\t")             ; insert the appropriate widget
+      (widget-insert "\t")      ; insert the appropriate widget
       (cond
        ;;------------------------------ list, list* ------------
        ((member* (eval wtype) '(list list*) :test 'equal)
@@ -1716,7 +1716,7 @@ is non-nil if this is a 'range widget."
   "A link to an info file for the Gnuplot GUI."
   :action '(lambda (widget &optional event)
              (let ((gnuplot-info-display 'frame))
-               (if gnuplot-keywords-pending            ; <HW>
+               (if gnuplot-keywords-pending     ; <HW>
                    (gnuplot-setup-info-look))
                (gnuplot-info-lookup-symbol (widget-value widget)
                                            'gnuplot-mode))))
diff --git a/gnuplot.el b/gnuplot.el
index 881065e..382f0a2 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -129,7 +129,7 @@
 ;;
 ;; Something like
 ;;   (setq auto-mode-alist (append '(("\\.gp$" . gnuplot-mode))
-;;                                auto-mode-alist))
+;;                                 auto-mode-alist))
 ;; is useful for having files ending in .gp start up in gnuplot-mode.
 ;;
 ;; Something like
@@ -145,7 +145,7 @@
 ;;   2.  Make sure info can find gnuplot.info by putting this in your
 ;;       .emacs file:
 ;;         (setenv "INFOPATH"
-;;           (concat (getenv "INFOPATH") ":"
+;;            (concat (getenv "INFOPATH") ":"
 ;;                    (expand-file-name "/path/to/file")))
 ;;       where "/path/to/file" is the location of gnuplot.info
 ;;
@@ -416,7 +416,7 @@ real work."
   :link '(url-link :tag "Homepage"
                    "https://github.com/emacsorphanage/gnuplot/";)
   :link '(custom-manual "(gnuplot)Top")
-  :link '(emacs-commentary-link :tag "Commentary" "gnuplot.el") )
+  :link '(emacs-commentary-link :tag "Commentary" "gnuplot.el"))
 (defgroup gnuplot-insertions nil
   "Insert commands into gnuplot-scripts from a pull-down menu."
   :prefix "gnuplot-insertions-"
@@ -462,27 +462,27 @@ version 20.2.
 For the newer version of info-look, do this:
 
   (add-hook \'gnuplot-info-hook
-           \'(lambda ()
-              (let ((elem (assoc \'gnuplot-mode info-lookup-alist)))
-                (delete elem info-lookup-alist)
-                (info-lookup-maybe-add-help
-                 :mode 'gnuplot-mode :topic 'symbol
-                 :regexp \"[a-zA-Z][_a-zA-Z0-9]*\"
-                 :doc-spec '((\"(gnuplot)General Index\" nil
-                              \"[_a-zA-Z0-9]+\"))))))
+            \'(lambda ()
+               (let ((elem (assoc \'gnuplot-mode info-lookup-alist)))
+                 (delete elem info-lookup-alist)
+                 (info-lookup-maybe-add-help
+                  :mode 'gnuplot-mode :topic 'symbol
+                  :regexp \"[a-zA-Z][_a-zA-Z0-9]*\"
+                  :doc-spec '((\"(gnuplot)General Index\" nil
+                               \"[_a-zA-Z0-9]+\"))))))
 
 For the older version of info-look, do this:
 
   (add-hook \'gnuplot-info-hook
-           \'(lambda ()
-              (let ((elem (assoc \'gnuplot-mode info-lookup-alist)))
-                (delete elem info-lookup-alist)
-                (setq info-lookup-alist
-                      (append info-lookup-alist
-                              \'((gnuplot-mode
-                                 \"[a-zA-Z][_a-zA-Z0-9]*\" nil
-                                 ((\"(gnuplot)General Index\" nil
-                                   \"[_a-zA-Z0-9]+\" )))))))))"
+            \'(lambda ()
+               (let ((elem (assoc \'gnuplot-mode info-lookup-alist)))
+                 (delete elem info-lookup-alist)
+                 (setq info-lookup-alist
+                       (append info-lookup-alist
+                               \'((gnuplot-mode
+                                  \"[a-zA-Z][_a-zA-Z0-9]*\" nil
+                                  ((\"(gnuplot)General Index\" nil
+                                    \"[_a-zA-Z0-9]+\" )))))))))"
   :group 'gnuplot-hooks
   :type 'hook)
 
@@ -619,8 +619,8 @@ beginning the continued command."
 ;;   "Force gnuplot-mode to behave for this version of gnuplot."
 ;;   :group 'gnuplot
 ;;   :type '(radio (const :tag "unspecified"   nil)
-;;             (const :tag "3.8 or newer" "3.8")
-;;             (const :tag "3.7 or older" "3.7")))
+;;              (const :tag "3.8 or newer" "3.8")
+;;              (const :tag "3.7 or older" "3.7")))
 
 (defvar gnuplot-info-frame nil)
 (defvar gnuplot-info-nodes '())
@@ -635,7 +635,7 @@ beginning the continued command."
 These are set by `gnuplot-set-keywords-list' from the values in
 `info-lookup-cache'.")
 (defvar gnuplot-keywords-alist nil) ;; For all-completions
-(defvar gnuplot-keywords-pending t     ;; <HW>
+(defvar gnuplot-keywords-pending t      ;; <HW>
   "A boolean which gets toggled when the info file is probed.")
 (defcustom gnuplot-keywords-when 'deferred ;; 'immediately
   "This variable controls when the info file is parsed.
@@ -884,9 +884,9 @@ the \"regis\" terminal type to the terminal sub-menu:
   'gnuplot-load-hook
   '(lambda ()
       (setq gnuplot-insertions-terminal
-           (append gnuplot-insertions-terminal
-                   (list
-                    [\"regis\"
+            (append gnuplot-insertions-terminal
+                    (list
+                     [\"regis\"
                       (gnuplot-insert \"set terminal regis\")
                        t])))))")
 
@@ -905,42 +905,42 @@ create a `gnuplot-mode' buffer."
 (defcustom gnuplot-insertions-adornments ; this is icky...
   (if gnuplot-three-eight-p
       '("adornments"
-        ["arrow"       (gnuplot-insert "set arrow ")         t]
-        ["bar"        (gnuplot-insert "set bar")             t]
-        ["border"      (gnuplot-insert "set border")         t]
-        ["boxwidth"    (gnuplot-insert "set boxwidth ")              t]
-        ["format"      (gnuplot-insert "set format ")        t]
-        ["grid"               (gnuplot-insert "set grid")            t]
-        ["key"        (gnuplot-insert "set key ")            t]
-        ["label"       (gnuplot-insert "set label ")         t]
+        ["arrow"       (gnuplot-insert "set arrow ")          t]
+        ["bar"         (gnuplot-insert "set bar")             t]
+        ["border"      (gnuplot-insert "set border")          t]
+        ["boxwidth"    (gnuplot-insert "set boxwidth ")       t]
+        ["format"      (gnuplot-insert "set format ")         t]
+        ["grid"        (gnuplot-insert "set grid")            t]
+        ["key"         (gnuplot-insert "set key ")            t]
+        ["label"       (gnuplot-insert "set label ")          t]
         ["pointsize"   (gnuplot-insert "set pointsize ")      t]
-        ["samples"     (gnuplot-insert "set samples ")       t]
-        ["size"        (gnuplot-insert "set size ")          t]
+        ["samples"     (gnuplot-insert "set samples ")        t]
+        ["size"        (gnuplot-insert "set size ")           t]
         ["style"       (gnuplot-insert "set style ")          t]
-        ["tics"        (gnuplot-insert "set tics ")          t]
+        ["tics"        (gnuplot-insert "set tics ")           t]
         ["timefmt"     (gnuplot-insert "set timefmt ")        t]
         ["timestamp"   (gnuplot-insert "set timestamp ")      t]
-        ["title"       (gnuplot-insert "set title ")         t]
-        ["zeroaxis"    (gnuplot-insert "set zeroaxis")        t] )
+        ["title"       (gnuplot-insert "set title ")          t]
+        ["zeroaxis"    (gnuplot-insert "set zeroaxis")        t])
     '("adornments"
       ["data style"     (gnuplot-insert "set data style ")     t]
       ["function style" (gnuplot-insert "set function style ") t]
-      ["arrow"          (gnuplot-insert "set arrow ")         t]
-      ["bar"           (gnuplot-insert "set bar")             t]
-      ["border"         (gnuplot-insert "set border")         t]
+      ["arrow"          (gnuplot-insert "set arrow ")          t]
+      ["bar"            (gnuplot-insert "set bar")             t]
+      ["border"         (gnuplot-insert "set border")          t]
       ["boxwidth"       (gnuplot-insert "set boxwidth ")       t]
-      ["format"         (gnuplot-insert "set format ")        t]
-      ["grid"          (gnuplot-insert "set grid")            t]
-      ["key"           (gnuplot-insert "set key ")            t]
-      ["label"          (gnuplot-insert "set label ")         t]
+      ["format"         (gnuplot-insert "set format ")         t]
+      ["grid"           (gnuplot-insert "set grid")            t]
+      ["key"            (gnuplot-insert "set key ")            t]
+      ["label"          (gnuplot-insert "set label ")          t]
       ["pointsize"      (gnuplot-insert "set pointsize ")      t]
-      ["samples"        (gnuplot-insert "set samples ")               t]
-      ["size"           (gnuplot-insert "set size ")          t]
-      ["tics"           (gnuplot-insert "set tics ")          t]
+      ["samples"        (gnuplot-insert "set samples ")        t]
+      ["size"           (gnuplot-insert "set size ")           t]
+      ["tics"           (gnuplot-insert "set tics ")           t]
       ["timefmt"        (gnuplot-insert "set timefmt ")        t]
       ["timestamp"      (gnuplot-insert "set timestamp ")      t]
-      ["title"          (gnuplot-insert "set title ")         t]
-      ["zeroaxis"       (gnuplot-insert "set zeroaxis")        t] ))
+      ["title"          (gnuplot-insert "set title ")          t]
+      ["zeroaxis"       (gnuplot-insert "set zeroaxis")        t]))
   "Adornments submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -957,18 +957,18 @@ create a `gnuplot-mode' buffer."
 
 (defcustom gnuplot-insertions-plot-options
   '("plot options"
-    ["autoscale"  (gnuplot-insert "set autoscale ")         t]
-    ["clip"      (gnuplot-insert "set clip ")               t]
-    ["encoding"   (gnuplot-insert "set encoding ")          t]
-    ["locale"     (gnuplot-insert "set locale ")            t]
-    ["logscale"          (gnuplot-insert "set logscale ")           t]
-    ["multiplot"  (gnuplot-insert "set multiplot")          t]
-    ["missing"   (gnuplot-insert "set missing \"\"")        t]
-    ["palette"    (gnuplot-insert "set palette ")            t]        ; <MT>
+    ["autoscale"  (gnuplot-insert "set autoscale ")          t]
+    ["clip"       (gnuplot-insert "set clip ")               t]
+    ["encoding"   (gnuplot-insert "set encoding ")           t]
+    ["locale"     (gnuplot-insert "set locale ")             t]
+    ["logscale"   (gnuplot-insert "set logscale ")           t]
+    ["multiplot"  (gnuplot-insert "set multiplot")           t]
+    ["missing"    (gnuplot-insert "set missing \"\"")        t]
+    ["palette"    (gnuplot-insert "set palette ")            t]         ; <MT>
     ["pm3d"       (gnuplot-insert "set pm3d ")               t]
-    ["offsets"   (gnuplot-insert "set offsets ")            t]
-    ["output"     (gnuplot-insert "set output ")            t]
-    ["zero"      (gnuplot-insert "set zero ")               t] )
+    ["offsets"    (gnuplot-insert "set offsets ")            t]
+    ["output"     (gnuplot-insert "set output ")             t]
+    ["zero"       (gnuplot-insert "set zero ")               t])
   "Plot options submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -997,9 +997,9 @@ create a `gnuplot-mode' buffer."
     ["tek40xx"    (gnuplot-insert "set terminal tek40xx")    t]
     ["tkcanvas"   (gnuplot-insert "set terminal tkcanvas")   t]
     ["tpic"       (gnuplot-insert "set terminal tpic")       t]
-    ["vgagl"      (gnuplot-insert "set terminal vgagl")      t]        ; for 
pm3d patch
+    ["vgagl"      (gnuplot-insert "set terminal vgagl")      t]         ; for 
pm3d patch
     ["vttek"      (gnuplot-insert "set terminal vttek")      t]
-    ["x11"        (gnuplot-insert "set terminal x11")        t] )
+    ["x11"        (gnuplot-insert "set terminal x11")        t] ยง)
   "Terminal submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -1015,14 +1015,14 @@ create a `gnuplot-mode' buffer."
 
 (defcustom gnuplot-insertions-x-axis
   '("x-axis"
-    ["xdata"     (gnuplot-insert "set xdata ")              t]
-    ["xlabel"    (gnuplot-insert "set xlabel ")             t]
-    ["xrange"    (gnuplot-insert "set xrange [:]")          t]
-    ["xtics"     (gnuplot-insert "set xtics ")              t]
-    ["mxtics"    (gnuplot-insert "set mxtics ")             t]
-    ["xzeroaxis"  (gnuplot-insert "set xzeroaxis ")         t]
-    ["xdtics"    (gnuplot-insert "set xdtics ")             t]
-    ["xmtics"    (gnuplot-insert "set xmtics ")             t])
+    ["xdata"      (gnuplot-insert "set xdata ")              t]
+    ["xlabel"     (gnuplot-insert "set xlabel ")             t]
+    ["xrange"     (gnuplot-insert "set xrange [:]")          t]
+    ["xtics"      (gnuplot-insert "set xtics ")              t]
+    ["mxtics"     (gnuplot-insert "set mxtics ")             t]
+    ["xzeroaxis"  (gnuplot-insert "set xzeroaxis ")          t]
+    ["xdtics"     (gnuplot-insert "set xdtics ")             t]
+    ["xmtics"     (gnuplot-insert "set xmtics ")             t])
   "X-axis submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -1038,14 +1038,14 @@ create a `gnuplot-mode' buffer."
 
 (defcustom gnuplot-insertions-x2-axis
   '("x2-axis"
-    ["x2data"    (gnuplot-insert "set xdata ")              t]
-    ["x2label"   (gnuplot-insert "set xlabel ")             t]
-    ["x2range"   (gnuplot-insert "set xrange [:]")          t]
-    ["x2tics"    (gnuplot-insert "set xtics ")              t]
-    ["mx2tics"   (gnuplot-insert "set mxtics ")             t]
-    ["x2zeroaxis" (gnuplot-insert "set xzeroaxis ")         t]
-    ["x2dtics"   (gnuplot-insert "set xdtics ")             t]
-    ["x2mtics"   (gnuplot-insert "set xmtics ")             t])
+    ["x2data"     (gnuplot-insert "set xdata ")              t]
+    ["x2label"    (gnuplot-insert "set xlabel ")             t]
+    ["x2range"    (gnuplot-insert "set xrange [:]")          t]
+    ["x2tics"     (gnuplot-insert "set xtics ")              t]
+    ["mx2tics"    (gnuplot-insert "set mxtics ")             t]
+    ["x2zeroaxis" (gnuplot-insert "set xzeroaxis ")          t]
+    ["x2dtics"    (gnuplot-insert "set xdtics ")             t]
+    ["x2mtics"    (gnuplot-insert "set xmtics ")             t])
   "X2-axis submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -1061,14 +1061,14 @@ create a `gnuplot-mode' buffer."
 
 (defcustom gnuplot-insertions-y-axis
   '("y-axis"
-    ["ydata"     (gnuplot-insert "set ydata ")              t]
-    ["ylabel"    (gnuplot-insert "set ylabel ")             t]
-    ["ymtics"    (gnuplot-insert "set ymtics ")             t]
-    ["yrange"    (gnuplot-insert "set yrange [:]")          t]
-    ["ytics"     (gnuplot-insert "set ytics ")              t]
-    ["yzeroaxis"  (gnuplot-insert "set yzeroaxis ")         t]
-    ["ydtics"    (gnuplot-insert "set ydtics ")             t]
-    ["mytics"    (gnuplot-insert "set mytics ")             t])
+    ["ydata"      (gnuplot-insert "set ydata ")              t]
+    ["ylabel"     (gnuplot-insert "set ylabel ")             t]
+    ["ymtics"     (gnuplot-insert "set ymtics ")             t]
+    ["yrange"     (gnuplot-insert "set yrange [:]")          t]
+    ["ytics"      (gnuplot-insert "set ytics ")              t]
+    ["yzeroaxis"  (gnuplot-insert "set yzeroaxis ")          t]
+    ["ydtics"     (gnuplot-insert "set ydtics ")             t]
+    ["mytics"     (gnuplot-insert "set mytics ")             t])
   "Y-axis submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -1083,14 +1083,14 @@ create a `gnuplot-mode' buffer."
 
 (defcustom gnuplot-insertions-y2-axis
   '("y2-axis"
-    ["y2data"    (gnuplot-insert "set ydata ")              t]
-    ["y2label"   (gnuplot-insert "set ylabel ")             t]
-    ["y2range"   (gnuplot-insert "set yrange [:]")          t]
-    ["y2tics"    (gnuplot-insert "set ytics ")              t]
-    ["my2tics"   (gnuplot-insert "set mytics ")             t]
-    ["y2zeroaxis"  (gnuplot-insert "set yzeroaxis ")        t]
-    ["y2mtics"   (gnuplot-insert "set ymtics ")             t]
-    ["y2dtics"   (gnuplot-insert "set ydtics ")             t])
+    ["y2data"     (gnuplot-insert "set ydata ")              t]
+    ["y2label"    (gnuplot-insert "set ylabel ")             t]
+    ["y2range"    (gnuplot-insert "set yrange [:]")          t]
+    ["y2tics"     (gnuplot-insert "set ytics ")              t]
+    ["my2tics"    (gnuplot-insert "set mytics ")             t]
+    ["y2zeroaxis"  (gnuplot-insert "set yzeroaxis ")         t]
+    ["y2mtics"    (gnuplot-insert "set ymtics ")             t]
+    ["y2dtics"    (gnuplot-insert "set ydtics ")             t])
   "Y2-axis submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -1107,13 +1107,13 @@ create a `gnuplot-mode' buffer."
 
 (defcustom gnuplot-insertions-z-axis
   '("z-axis"
-    ["zdata"     (gnuplot-insert "set zdata ")              t]
-    ["zlabel"    (gnuplot-insert "set zlabel ")             t]
-    ["zrange"    (gnuplot-insert "set zrange [:]")          t]
-    ["ztics"     (gnuplot-insert "set ztics ")              t]
-    ["mztics"    (gnuplot-insert "set mztics ")             t]
-    ["zdtics"    (gnuplot-insert "set zdtics ")             t]
-    ["zmtics"    (gnuplot-insert "set zmtics ")             t] )
+    ["zdata"      (gnuplot-insert "set zdata ")              t]
+    ["zlabel"     (gnuplot-insert "set zlabel ")             t]
+    ["zrange"     (gnuplot-insert "set zrange [:]")          t]
+    ["ztics"      (gnuplot-insert "set ztics ")              t]
+    ["mztics"     (gnuplot-insert "set mztics ")             t]
+    ["zdtics"     (gnuplot-insert "set zdtics ")             t]
+    ["zmtics"     (gnuplot-insert "set zmtics ")             t])
   "Z-axis submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -1129,12 +1129,12 @@ create a `gnuplot-mode' buffer."
 
 (defcustom gnuplot-insertions-parametric-plots
   '("parametric plots"
-    ["parametric" (gnuplot-insert "set parametric")         t]
-    ["isosamples" (gnuplot-insert "set isosamples ")        t]
-    ["dummy"     (gnuplot-insert "set dummy ")              t]
-    ["trange"    (gnuplot-insert "set trange [:]")          t]
-    ["urange"    (gnuplot-insert "set urange [:]")          t]
-    ["vrange"    (gnuplot-insert "set vrange [:]")          t] )
+    ["parametric" (gnuplot-insert "set parametric")          t]
+    ["isosamples" (gnuplot-insert "set isosamples ")         t]
+    ["dummy"      (gnuplot-insert "set dummy ")              t]
+    ["trange"     (gnuplot-insert "set trange [:]")          t]
+    ["urange"     (gnuplot-insert "set urange [:]")          t]
+    ["vrange"     (gnuplot-insert "set vrange [:]")          t])
   "Parametric plots submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -1150,9 +1150,9 @@ create a `gnuplot-mode' buffer."
 
 (defcustom gnuplot-insertions-polar-plots
   '("polar plots"
-    ["polar"     (gnuplot-insert "set polar")               t]
-    ["angles"    (gnuplot-insert "set angles ")             t]
-    ["rrange"    (gnuplot-insert "set rrange [:]")          t] )
+    ["polar"      (gnuplot-insert "set polar")               t]
+    ["angles"     (gnuplot-insert "set angles ")             t]
+    ["rrange"     (gnuplot-insert "set rrange [:]")          t])
   "Polar plots submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -1168,14 +1168,14 @@ create a `gnuplot-mode' buffer."
 
 (defcustom gnuplot-insertions-surface-plots
   '("surface plots"
-    ["clabel"    (gnuplot-insert "set clabel ")             t]
-    ["cntrparam"  (gnuplot-insert "set cntrparam ")         t]
-    ["contour"   (gnuplot-insert "set contour")             t]
-    ["dgrid3d"   (gnuplot-insert "set dgrid3d ")            t]
-    ["hidden3d"          (gnuplot-insert "set hidden3d ")           t]
-    ["mapping"   (gnuplot-insert "set mapping ")            t]
-    ["surface"   (gnuplot-insert "set surface ")            t]
-    ["view"      (gnuplot-insert "set view ")               t] )
+    ["clabel"     (gnuplot-insert "set clabel ")             t]
+    ["cntrparam"  (gnuplot-insert "set cntrparam ")          t]
+    ["contour"    (gnuplot-insert "set contour")             t]
+    ["dgrid3d"    (gnuplot-insert "set dgrid3d ")            t]
+    ["hidden3d"   (gnuplot-insert "set hidden3d ")           t]
+    ["mapping"    (gnuplot-insert "set mapping ")            t]
+    ["surface"    (gnuplot-insert "set surface ")            t]
+    ["view"       (gnuplot-insert "set view ")               t])
   "Surface plots submenu in the insertions menu.
 See the document string for `gnuplot-insertions-menu'
 Changing this will not effect a change in any currently existing
@@ -1227,7 +1227,7 @@ opening an argument-setting popup.")
 
 (defun gnuplot-setup-menubar ()
   "Initial setup of gnuplot and insertions menus."
-  (if gnuplot-insertions-menu-flag     ; set up insertions menu
+  (if gnuplot-insertions-menu-flag      ; set up insertions menu
       (progn
         (if gnuplot-xemacs-p
             (setq gnuplot-insertions-top
@@ -1253,10 +1253,10 @@ opening an argument-setting popup.")
           "Insertions menu used in Gnuplot-mode"
           gnuplot-insertions-menu)
         (easy-menu-add gnuplot-mode-insertions-menu gnuplot-mode-map)))
-  (easy-menu-define                    ; set up gnuplot menu
+  (easy-menu-define                     ; set up gnuplot menu
     gnuplot-mode-menu gnuplot-mode-map "Menu used in gnuplot-mode"
     gnuplot-menu)
-  (easy-menu-add gnuplot-mode-menu gnuplot-mode-map) )
+  (easy-menu-add gnuplot-mode-menu gnuplot-mode-map))
 
 ;; There is no `mark-active' variable in XEmacs.  Hassle!  This is not
 ;; only replicates mark-active, but it only returns true if the region
@@ -1327,7 +1327,7 @@ This is basically swiped from VM."
      ((eq (symbol-value gnuplot-toolbar-use-toolbar) top-toolbar)
       (setq gnuplot-toolbar-location       "top")
       (set-specifier top-toolbar           toolbar buffer)
-      (set-specifier top-toolbar-height    height frame tag-set))) ))
+      (set-specifier top-toolbar-height    height frame tag-set)))))
 
 (defvar gnuplot-line-xpm
   (if (and (featurep 'xpm) (fboundp 'toolbar-make-button-list))
@@ -1642,7 +1642,7 @@ static char *help_btn[] = {
         (gnuplot-toolbar-setup-toolbar gnuplot-toolbar)
         (add-spec-to-specifier (symbol-value gnuplot-toolbar-use-toolbar)
                                gnuplot-toolbar
-                               (current-buffer) ))))
+                               (current-buffer)))))
 
 ;;(defalias 'gnuplot-make-toolbar 'gnuplot-make-toolbar-function)
 
@@ -1770,7 +1770,7 @@ These are highlighted using `font-lock-constant-face'.")
 (defvar gnuplot-font-lock-syntactic-keywords nil)
 (defvar gnuplot-font-lock-defaults nil)
 
-(when (featurep 'font-lock)            ; <KL>
+(when (featurep 'font-lock)             ; <KL>
   (setq gnuplot-font-lock-keywords
         (list
          ;; stuff in brackets, sugg. by <LB>
@@ -1802,9 +1802,9 @@ These are highlighted using `font-lock-constant-face'.")
 
   (setq gnuplot-font-lock-defaults
         '(gnuplot-font-lock-keywords
-          nil                          ; Use syntactic fontification
-          t                            ; Use case folding
-          nil                          ; No extra syntax
+          nil                           ; Use syntactic fontification
+          t                             ; Use case folding
+          nil                           ; No extra syntax
           ;; calls `gnuplot-beginning-of-continuation'
           ;; to find a safe place to begin syntactic highlighting
           beginning-of-defun))
@@ -1933,7 +1933,7 @@ This is a simple wrapper for `syntax-ppss'."
           (setq list (append list (list line))
                 line "")
         (setq line (concat line (char-to-string (elt string index)))))
-      (setq index (1+ index)) )
+      (setq index (1+ index)))
     list))
 
 ;; -- the calls to `sleep-for' are to allow enough time for gnuplot
@@ -1948,7 +1948,7 @@ the type of text being sent to gnuplot and is typically 
one of
 nil, 'line, 'region, 'buffer, or 'file.  TEXT may be useful for
 functions in `gnuplot-after-plot-hook'.  `gnuplot-after-plot-hook' is
 called by this function after all of STRING is sent to gnuplot."
-  (gnuplot-make-gnuplot-buffer)        ; make sure a gnuplot buffer exists
+  (gnuplot-make-gnuplot-buffer)         ; make sure a gnuplot buffer exists
   (gnuplot-fetch-version-number)
   (setq gnuplot-comint-recent-buffer (current-buffer))
 
@@ -2027,7 +2027,7 @@ This sets `gnuplot-recently-sent' to 'line."
              (end-of-line)
              (while (save-excursion
                       (backward-char)
-                      (looking-at "\\\\"))     ; go to end of last 
continuation line
+                      (looking-at "\\\\"))      ; go to end of last 
continuation line
                (end-of-line 2))
              (beginning-of-line 2)
              (setq end (point)))
@@ -2052,7 +2052,7 @@ NUM is optional arg."
     (while (> num 0)
       (setq end (gnuplot-send-line-to-gnuplot))
       (goto-char end)
-      (backward-char 1)                        ; <AR>
+      (backward-char 1)                         ; <AR>
       (gnuplot-forward-script-line 1)
       (setq num (1- num)))))
 
@@ -2090,7 +2090,7 @@ This sets `gnuplot-recently-sent' to 'file."
   (let ((string (read-file-name "Name of file to send to gnuplot > " nil nil 
t)))
     (setq string (concat "load '" (expand-file-name string) "'\n"))
     (message "%S" string)
-    (gnuplot-make-gnuplot-buffer)      ; make sure a gnuplot buffer exists
+    (gnuplot-make-gnuplot-buffer)       ; make sure a gnuplot buffer exists
     (gnuplot-send-string-to-gnuplot string 'file)))
 
 ;; suggested by <JS>
@@ -2151,7 +2151,7 @@ this function is attached to `gnuplot-after-plot-hook'"
             (goto-char (point-min))
             (kill-line)
             (setq nlines (1- nlines)))
-          (goto-char (point-max)) ))))
+          (goto-char (point-max))))))
 (add-hook 'gnuplot-after-plot-hook 'gnuplot-trim-gnuplot-buffer nil nil)
 
 
@@ -2160,9 +2160,9 @@ this function is attached to `gnuplot-after-plot-hook'"
 ;; Menu for the comint-mode buffer
 (defvar gnuplot-comint-menu
   `("Gnuplot"
-    ["Plot most recent gnuplot buffer"         gnuplot-plot-from-comint
+    ["Plot most recent gnuplot buffer"          gnuplot-plot-from-comint
      (buffer-live-p gnuplot-comint-recent-buffer)]
-    ["Save and plot most recent gnuplot buffer"        
gnuplot-save-and-plot-from-comint
+    ["Save and plot most recent gnuplot buffer"         
gnuplot-save-and-plot-from-comint
      (buffer-live-p gnuplot-comint-recent-buffer)]
     "---"
     ,gnuplot-display-options-menu
@@ -2174,23 +2174,23 @@ this function is attached to `gnuplot-after-plot-hook'"
      :style toggle
      :selected eldoc-mode]
     "---"
-    ["Insert filename at point"                        gnuplot-insert-filename 
t]
-    ["Negate set option"                       gnuplot-negate-option t]
-    ["Keyword help"                            gnuplot-info-lookup-symbol
+    ["Insert filename at point"                         
gnuplot-insert-filename t]
+    ["Negate set option"                        gnuplot-negate-option t]
+    ["Keyword help"                             gnuplot-info-lookup-symbol
      (or gnuplot-keywords gnuplot-keywords-pending)]
     ["Quick help for thing at point"            gnuplot-help-function
      gnuplot-context-sensitive-mode]
     ["Info documentation on thing at point"
      gnuplot-info-at-point
      gnuplot-context-sensitive-mode]
-    ["Switch to recent gnuplot script buffer"  gnuplot-pop-to-recent-buffer
+    ["Switch to recent gnuplot script buffer"   gnuplot-pop-to-recent-buffer
      (buffer-live-p gnuplot-comint-recent-buffer)]
     "---"
-    ["Customize gnuplot"                       gnuplot-customize t]
-    ["Show gnuplot-mode version"               gnuplot-show-version t]
-    ["Show gnuplot version"                    gnuplot-show-gnuplot-version t]
+    ["Customize gnuplot"                        gnuplot-customize t]
+    ["Show gnuplot-mode version"                gnuplot-show-version t]
+    ["Show gnuplot version"                     gnuplot-show-gnuplot-version t]
     "---"
-    ["Kill gnuplot"                            gnuplot-kill-gnuplot-buffer t]))
+    ["Kill gnuplot"                             gnuplot-kill-gnuplot-buffer 
t]))
 
 ;; Major mode `gnuplot-comint-mode' for the interaction buffer
 (define-derived-mode gnuplot-comint-mode comint-mode "Gnuplot interaction"
@@ -2201,7 +2201,7 @@ buffer."
 
   (set-syntax-table gnuplot-mode-syntax-table)
 
-  (if gnuplot-xemacs-p                 ; deal with font-lock
+  (if gnuplot-xemacs-p                  ; deal with font-lock
       (if (fboundp 'turn-on-font-lock) (turn-on-font-lock))
     (progn
       (setq font-lock-defaults gnuplot-font-lock-defaults)
@@ -2236,23 +2236,23 @@ buffer."
   (easy-menu-add gnuplot-comint-mode-menu gnuplot-comint-mode-map))
 
 ;; Key bindings for gnuplot-comint-mode
-(define-key gnuplot-comint-mode-map "\M-\C-p"  'gnuplot-plot-from-comint)
-(define-key gnuplot-comint-mode-map "\M-\C-f"  
'gnuplot-save-and-plot-from-comint)
-(define-key gnuplot-comint-mode-map "\C-d"     'gnuplot-delchar-or-maybe-eof)
+(define-key gnuplot-comint-mode-map "\M-\C-p"   'gnuplot-plot-from-comint)
+(define-key gnuplot-comint-mode-map "\M-\C-f"   
'gnuplot-save-and-plot-from-comint)
+(define-key gnuplot-comint-mode-map "\C-d"      'gnuplot-delchar-or-maybe-eof)
 (let ((completion-function
        (if (and (>= emacs-major-version 24)
                 (>= emacs-minor-version 1))
            'completion-at-point
          'comint-dynamic-complete)))
-  (define-key gnuplot-comint-mode-map "\M-\r"  completion-function)
-  (define-key gnuplot-comint-mode-map "\M-\t"  completion-function))
+  (define-key gnuplot-comint-mode-map "\M-\r"   completion-function)
+  (define-key gnuplot-comint-mode-map "\M-\t"   completion-function))
 (define-key gnuplot-comint-mode-map "\C-c\C-d"  'gnuplot-info-lookup-symbol)
-(define-key gnuplot-comint-mode-map "\C-c\C-w" 'gnuplot-show-version)
-(define-key gnuplot-comint-mode-map "\C-c\C-i" 'gnuplot-insert-filename)
-(define-key gnuplot-comint-mode-map "\C-c\C-n" 'gnuplot-negate-option)
-(define-key gnuplot-comint-mode-map "\C-c\C-p" 'gnuplot-show-gnuplot-version)
-(define-key gnuplot-comint-mode-map "\C-c\C-z" 'gnuplot-customize)
-(define-key gnuplot-comint-mode-map "\C-c\C-e" 'gnuplot-pop-to-recent-buffer)
+(define-key gnuplot-comint-mode-map "\C-c\C-w"  'gnuplot-show-version)
+(define-key gnuplot-comint-mode-map "\C-c\C-i"  'gnuplot-insert-filename)
+(define-key gnuplot-comint-mode-map "\C-c\C-n"  'gnuplot-negate-option)
+(define-key gnuplot-comint-mode-map "\C-c\C-p"  'gnuplot-show-gnuplot-version)
+(define-key gnuplot-comint-mode-map "\C-c\C-z"  'gnuplot-customize)
+(define-key gnuplot-comint-mode-map "\C-c\C-e"  'gnuplot-pop-to-recent-buffer)
 (define-key gnuplot-comint-mode-map "\C-c\M-i"  'gnuplot-inline-image-mode)
 
 ;; Menu for gnuplot-comint-mode
@@ -2324,7 +2324,7 @@ defaults to 3.7."
   (gnuplot-setup-menubar)
   ;; set up the toolbar (possibly dependent on version number)
   (if (and gnuplot-xemacs-p gnuplot-toolbar-display-flag)
-      (condition-case ()               ; deal with the toolbar
+      (condition-case ()                ; deal with the toolbar
           (and (require 'toolbar)
                (require 'xpm)
                (gnuplot-make-toolbar-function))
@@ -2353,7 +2353,7 @@ STRING is the text as originally inserted in the comint 
buffer."
             (put-text-property b e 'intangible t)
             (put-text-property b e 'face 'gnuplot-prompt-face)
             ;;(put-text-property b e 'read-only t)
-            )) )))
+            )))))
 
 (defun gnuplot-close-down ()
   "Tidy up when deleting the gnuplot buffer."
@@ -2543,7 +2543,7 @@ Bound to \\[gnuplot-insert-filename]"
   (insert gnuplot-quote-character
           (file-relative-name (read-file-name "Filename > " "")
                               default-directory)
-          gnuplot-quote-character) )
+          gnuplot-quote-character))
 
 
 ;; Adjust indentation for the line containing point
@@ -2663,7 +2663,7 @@ If specify POS, move POS before execution."
 ARG is optional arg."
   (if (not arg) (setq arg 1))
   (if (> arg 0)
-      (catch 'bob              ; go to beginning of ARGth prev. defun
+      (catch 'bob               ; go to beginning of ARGth prev. defun
         (dotimes (n arg)
           (when (= (point)
                    (gnuplot-point-at-beginning-of-continuation))
@@ -2675,7 +2675,7 @@ ARG is optional arg."
           (gnuplot-beginning-of-continuation))
         t)
 
-    (catch 'eob                  ; find beginning of (-ARG)th following defun
+    (catch 'eob                   ; find beginning of (-ARG)th following defun
       (dotimes (n (- arg))
         (gnuplot-end-of-continuation)
         (forward-line)
@@ -2744,7 +2744,7 @@ Negatable options are defined in 
`gnuplot-keywords-negatable-options'."
                         (insert "no"))
                        (t
                         (message "There is not a negatable set option on this 
line")))))
-        (message "There is not a set option on this line")) )))
+        (message "There is not a set option on this line")))))
 
 ;; (defun gnuplot-set-binding ()
 ;;   "Interactively select a key sequence for binding to a plot function.
@@ -2752,19 +2752,19 @@ Negatable options are defined in 
`gnuplot-keywords-negatable-options'."
 ;; key bindings (i.e. those covered by pm3d)."
 ;;   (interactive)
 ;;   (let ((keyseq (read-key-sequence "Choose a key sequence now"))
-;;     (command (read-string "Bind to this command > ")))
+;;      (command (read-string "Bind to this command > ")))
 ;;     (setq keyseq (format "%S" keyseq))
 ;;     (string-match "keypress-event\\s-+" keyseq)
 ;;     (setq keyseq (substring keyseq (match-end 0) -2))
 ;;     ;; need to convert from emacs nomenclature to gnuplot.  what a pain.
 ;;     (let* ((alist '(("backspace" . "Backspace") ("tab" . "Tab") ("linefeed" 
. "Linefeed")
-;;                 ("clear" . "Clear") ("return" . "Return") ("pause" . 
"Pause")
-;;                 ("scroll-lock" . "Scroll_Lock") ("SysReq" . "sys-req")
-;;                 ("escape" . "Escape") ("delete" . "Delete") ("home" . 
"Home")
-;;                 ("left" . "Left") ("right" . "Right") ("up" . "Up") ("down" 
. "Down")
-;;                 ("prior" . "PageUp") ("next" . "PageDown") ("end" . "End")
-;;                 ("begin". "Begin")))
-;;        (match (assoc keyseq alist)))
+;;                  ("clear" . "Clear") ("return" . "Return") ("pause" . 
"Pause")
+;;                  ("scroll-lock" . "Scroll_Lock") ("SysReq" . "sys-req")
+;;                  ("escape" . "Escape") ("delete" . "Delete") ("home" . 
"Home")
+;;                  ("left" . "Left") ("right" . "Right") ("up" . "Up") 
("down" . "Down")
+;;                  ("prior" . "PageUp") ("next" . "PageDown") ("end" . "End")
+;;                  ("begin". "Begin")))
+;;         (match (assoc keyseq alist)))
 ;;       (if match (setq keyseq (cdr match)))
 ;;
 ;;     (insert (format "bind \"%s\" \"%s\"" keyseq command)))))
@@ -2823,7 +2823,7 @@ See the comments in `gnuplot-info-hook'."
                         `((gnuplot-mode
                            "[a-zA-Z][_a-zA-Z0-9]*" nil
                            ,doc-spec "[_a-zA-Z0-9]+" )))))
-                (t                     ; newer version
+                (t                      ; newer version
                  (info-lookup-add-help
                   :mode 'gnuplot-mode :topic 'symbol
                   :regexp "[a-zA-Z][_a-zA-Z0-9]*"
@@ -2846,7 +2846,7 @@ See the comments in `gnuplot-info-hook'."
           (and (get-buffer "info dir")    (kill-buffer "info dir"))
           (and (get-buffer "info dir<2>") (kill-buffer "info dir<2>")))
         (setq gnuplot-keywords (gnuplot-set-keywords-list))
-        (setq gnuplot-keywords-alist   ; needed for all-completions
+        (setq gnuplot-keywords-alist    ; needed for all-completions
               (mapcar 'list gnuplot-keywords)))
 
     ;; or do something sensible if info-look is not installed
@@ -2985,7 +2985,7 @@ Uses the cache of keywords generated by info-lookup.  See
 \(BEGIN END COMPLETIONS) where BEGIN and END are buffer
 positions and COMPLETIONS is a list."
 
-  (if gnuplot-keywords-pending         ; <HW>
+  (if gnuplot-keywords-pending          ; <HW>
       (gnuplot-setup-info-look))
   (let* ((end (point))
          (beg (unwind-protect (save-excursion (backward-sexp 1) (point))))
@@ -3023,7 +3023,7 @@ according to the value of `gnuplot-info-display'."
   (interactive
    (cond (gnuplot-keywords
           (info-lookup-interactive-arguments 'symbol))
-         (gnuplot-keywords-pending     ; <HW>
+         (gnuplot-keywords-pending      ; <HW>
           (gnuplot-setup-info-look)
           (info-lookup-interactive-arguments 'symbol))
          (t
@@ -3080,7 +3080,7 @@ shown."
   (cond ((and (not gnuplot-three-eight-p)
               (string-match "\\(emf\\|p\\(alette\\|m3d\\)\\|vgagl\\)" string))
          (message "%S is an option introduced in gnuplot 3.8 (You are using 
%s)"
-                  string gnuplot-program-version) )
+                  string gnuplot-program-version))
         (t
          (insert string)
          (let ((topic string) term)
@@ -3095,9 +3095,9 @@ shown."
                        gnuplot-gui-popup-flag)
                   (gnuplot-gui-set-options-and-insert))
                  (gnuplot-insertions-show-help-flag
-                  (if gnuplot-keywords-pending         ; <HW>
+                  (if gnuplot-keywords-pending          ; <HW>
                       (gnuplot-setup-info-look))
-                  (gnuplot-info-lookup-symbol topic)) ) )) ) )
+                  (gnuplot-info-lookup-symbol topic)))))))
 
 (defun gnuplot-toggle-info-display ()
   "Toggle info display."
@@ -3118,7 +3118,7 @@ work with newer and older versions.
 
 Report bugs at https://github.com/emacsorphanage/gnuplot/issues
 
-                           ------O------
+                            ------O------
 
 Gnuplot-mode includes two different systems for keyword
 completion and documentation lookup: a newer one,
@@ -3137,7 +3137,7 @@ provide function/`eldoc-mode' syntax hints as you type.  
This requires a
 separate file of strings, `gnuplot-eldoc.el', which is also
 provided by recent Gnuplot distributions.
 
-                           ------O------
+                            ------O------
 
 There are several known shortcomings of `gnuplot-mode', version 0.5g
 and up.  Many of the shortcomings involve the graphical interface
@@ -3159,7 +3159,7 @@ a list:
  5.  The GUI handling of \"hidden3d\" is flaky and \"cntrparam\" is
      unsupported.
 
-                           ------O------
+                            ------O------
 
  Key bindings:
  \\{gnuplot-mode-map}"
@@ -3185,7 +3185,7 @@ a list:
   (when (eq gnuplot-keywords-when 'immediately) ; <HW>
     (gnuplot-setup-info-look)) ;; <SE>
 
-  (if gnuplot-xemacs-p                 ; deal with font-lock
+  (if gnuplot-xemacs-p                  ; deal with font-lock
       (when (fboundp 'turn-on-font-lock)
         (turn-on-font-lock))
     (progn
@@ -3200,11 +3200,11 @@ a list:
       (set (make-local-variable 'font-lock-multiline) t)
       (set (make-local-variable 'parse-sexp-lookup-properties) t)))
 
-  (if (fboundp 'widget-create)         ; gnuplot-gui
+  (if (fboundp 'widget-create)          ; gnuplot-gui
       (condition-case ()
           (require 'gnuplot-gui)
         (error nil)))
-  (setq gnuplot-first-call nil         ; a few more details ...
+  (setq gnuplot-first-call nil          ; a few more details ...
         gnuplot-comint-recent-buffer (current-buffer)
         comint-process-echoes        gnuplot-echo-command-line-flag)
   (run-hooks 'gnuplot-mode-hook)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]