branch: externals/idlwave
commit 546e1985dcde3441491b15780396b5e20e219018
Author: JD Smith <jdtsm...@gmail.com>
Commit: JD Smith <jdtsm...@gmail.com>
Upstream changes from Emacs package:
spelling and obsolete variables.
---
idlw-help.el | 2 +-
idlw-scan.el | 4 ++--
idlw-variables.el | 18 +++++++-----------
idlwave.el | 28 +++++++++++++---------------
4 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/idlw-help.el b/idlw-help.el
index f69f4f76f9..76036cd1f5 100644
--- a/idlw-help.el
+++ b/idlw-help.el
@@ -580,7 +580,7 @@ see if a link is set for it. Try extra help functions if
necessary."
(file-directory-p help-loc)))
(error "Invalid help request"))
- ;; If possible, subsume as anchor under idl.htm
+ ;; If possible, subsume as anchor under idl.htm, new as of IDL 8.3
(if (file-exists-p alternate)
(setq help-loc (concat alternate "#")))
diff --git a/idlw-scan.el b/idlw-scan.el
index 47cca3af29..00e6907b4d 100644
--- a/idlw-scan.el
+++ b/idlw-scan.el
@@ -377,7 +377,7 @@ Does not run after automatic updates of buffer or the
shell.")
nil 'idlwave-load-rinfo-next-step)))
(error nil))))
-(defvar idlwave-library-routines nil "Obsolete variable.")
+(defvar idlwave-library-routines nil "Older library routine info.")
;;----------------------------------------------------
;; XML System Catalog
@@ -1662,7 +1662,7 @@ end
(setq idlwave-idlwave_routine_info-compiled t))
;; Restore if necessary. Must use execute to hide lame routine_info
- ;; errors on undefinded routine
+ ;; errors on undefined routine
(idlwave-shell-send-command
(format "if execute(\"_v=routine_info('idlwave_routine_info',/SOURCE)\") eq
0 then restore,'%s' else if _v.path eq '' then restore,'%s'"
idlwave-shell-temp-rinfo-save-file
diff --git a/idlw-variables.el b/idlw-variables.el
index b5becf5702..06a07ef8d4 100644
--- a/idlw-variables.el
+++ b/idlw-variables.el
@@ -373,10 +373,6 @@ completions."
:group 'idlwave-completion
:type 'boolean)
-(defvar idlwave-default-completion-case-is-down nil
- "Obsolete variable. See `idlwave-complete-empty-string-as-lower-case' and
-`idlwave-completion-case'.")
-
(defcustom idlwave-buffer-case-takes-precedence nil
"*Non-nil means, the case of tokens in buffers dominates over system stuff.
To make this possible, we need to re-case everything each time we update
@@ -427,7 +423,7 @@ The value of this variable may be nil to inhibit display,
or an integer to
indicate the maximum number of classes to display.
On XEmacs, a full list of classes will also be placed into a `help-echo'
-property on the competion items, so that the list of classes for the current
+property on the completion items, so that the list of classes for the current
item is displayed in the echo area. If the value of this variable is a
negative integer, the `help-echo' property will be suppressed."
:group 'idlwave-completion
@@ -575,7 +571,7 @@ or even '?'. '.' is not a good choice because it can make
structure
field names act like abbrevs in certain circumstances.
Changes to this in `idlwave-mode-hook' will have no effect. Instead a user
-must set it directly using `setq' in the .emacs file before idlwave.el
+must set it directly using `setq' in the init file before idlwave.el
is loaded."
:group 'idlwave-abbrev-and-indent-action
:type 'string)
@@ -1119,7 +1115,7 @@ As a user, you should not set this to t.")
(common-blocks
'("\\<\\(common\\)\\>[ \t]*\\(\\sw+\\)?[ \t]*,?"
(1 font-lock-keyword-face) ; "common"
- (2 font-lock-reference-face nil t) ; block name
+ (2 font-lock-constant-face nil t) ; block name
("[ \t]*\\(\\sw+\\)[ ,]*"
;; Start with point after block name and comma
(goto-char (match-end 0)) ; needed for XEmacs, could be nil
@@ -1137,20 +1133,20 @@ As a user, you should not set this to t.")
;; Labels
(label
- '("^[ \t]*\\([a-zA-Z]\\sw*:\\)" (1 font-lock-reference-face)))
+ '("^[ \t]*\\([a-zA-Z]\\sw*:\\)" (1 font-lock-constant-face)))
;; The goto statement and its label
(goto
'("\\(goto\\)[ \t]*,[ \t]*\\([a-zA-Z]\\sw*\\)"
(1 font-lock-keyword-face)
- (2 font-lock-reference-face)))
+ (2 font-lock-constant-face)))
;; Tags in structure definitions. Note that this definition
;; actually collides with labels, so we have to use the same
;; face. It also matches named subscript ranges,
;; e.g. vec{bottom:top]. No good way around this.
(structtag
- '("\\<\\([a-zA-Z][a-zA-Z0-9_]*:\\)[^:]" (1 font-lock-reference-face)))
+ '("\\<\\([a-zA-Z][a-zA-Z0-9_]*:\\)[^:]" (1 font-lock-constant-face)))
;; Structure names
(structname
@@ -1163,7 +1159,7 @@ As a user, you should not set this to t.")
;; fontification. Slow, use it only in fancy fontification.
(keyword-parameters
'("\\(,\\|[a-zA-Z0-9_](\\)[ \t]*\\(\\$[ \t]*\\(;.*\\)?\n\\([
\t]*\\(;.*\\)?\n\\)*[ \t]*\\)?\\(/[a-zA-Z_]\\sw*\\|[a-zA-Z_]\\sw*[ \t]*=\\)"
- (6 font-lock-reference-face)))
+ (6 font-lock-constant-face)))
;; System variables start with a bang.
(system-variables
diff --git a/idlwave.el b/idlwave.el
index c24e18eb44..ec237d82b6 100644
--- a/idlwave.el
+++ b/idlwave.el
@@ -44,7 +44,7 @@
;;
;; Follow the instructions in the INSTALL file of the distribution.
;; In short, put this file on your load path and add the following
-;; lines to your .emacs file:
+;; lines to your init file:
;;
;; (autoload 'idlwave-mode "idlwave" "IDLWAVE Mode" t)
;; (autoload 'idlwave-shell "idlw-shell" "IDLWAVE Shell" t)
@@ -107,9 +107,8 @@
;; idlwave-customize'.
;;
;; You can set your own preferred values with Customize, or with Lisp
-;; code in .emacs. For an example of what to put into .emacs, check
-;; the TexInfo documentation or see a complete .emacs available at the
-;; website.
+;; code in your init file. For an example of what to put into your
+;; init file, check the TexInfo documentation.
;;
;; KNOWN PROBLEMS:
;; ==============
@@ -311,7 +310,6 @@ The main features of this mode are
(set (make-local-variable 'comment-start-skip) ";+[ \t]*")
(set (make-local-variable 'comment-start) ";")
(set (make-local-variable 'comment-add) 1) ; ";;" for new and regions
- (set (make-local-variable 'require-final-newline) t)
(set (make-local-variable 'abbrev-all-caps) t)
(set (make-local-variable 'indent-tabs-mode) nil)
(set (make-local-variable 'completion-ignore-case) t)
@@ -524,7 +522,7 @@ If prefix ARG < 0 then move forward to enclosing block end."
(defun idlwave-down-block (&optional arg)
"Go down a block.
With ARG: ARG >= 0 go forwards, ARG < 0 go backwards.
-Returns non-nil if successfull."
+Returns non-nil if successful."
(interactive "p")
(let (status)
(if (< arg 0)
@@ -2544,7 +2542,7 @@ If PATTERN is omitted, it defaults to \"[
\\f\\t\\n\\r\\v]+\"."
(setq ret_string (concat ret_string (substring string start last)))))
(defun idlwave-downcase-safe (string)
- "Donwcase if string, else return unchanged."
+ "Downcase if string, else return unchanged."
(if (stringp string)
(downcase string)
string))
@@ -2813,13 +2811,13 @@ force class query for object methods."
(defvar idlwave-last-context-help-pos nil)
(defun idlwave-context-help (&optional arg)
"Display IDL Online Help on context.
-If point is on a keyword, help for that keyword will be shown. If
-point is on a routine name or in the argument list of a routine, help
-for that routine will be displayed. Works for system routines and
-keywords, it pulls up text help. For other routies and keywords,
-visits the source file, finding help in the header (if
-`idlwave-help-source-try-header' is non-nil) or the routine definition
-itself."
+If point is on a keyword, help for that keyword will be shown.
+If point is on a routine name or in the argument list of a
+routine, help for that routine will be displayed. Works for
+system routines and keywords, it pulls up text help. For other
+routines and keywords, visits the source file, finding help in
+the header (if `idlwave-help-source-try-header' is non-nil) or
+the routine definition itself."
(interactive "P")
(idlwave-do-context-help arg))
@@ -2827,7 +2825,7 @@ itself."
"Display online help about the completion at point."
(interactive "eP")
;; Restore last-command for next command, to make
- ;; scrolling/cancelling of completions work.
+ ;; scrolling/canceling of completions work.
(setq this-command last-command)
(idlwave-do-mouse-completion-help ev))
