diff options
Diffstat (limited to 'lisp/progmodes/idlwave.el')
| -rw-r--r-- | lisp/progmodes/idlwave.el | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 95c0e288bf2..30442fa0d34 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -309,7 +309,7 @@ beginning with a \";\". Expressions for comments at the beginning of the line should begin with \"^\"." :group 'idlwave-code-formatting :type '(choice (const :tag "Any line beginning with `;'" nil) - 'regexp)) + regexp)) (defcustom idlwave-code-comment ";;[^;]" "A comment that starts with this regular expression on a line by @@ -657,7 +657,7 @@ When you specify a class, this information can be stored as a text property on the `->' arrow in the source code, so that during the same editing session, IDLWAVE will not have to ask again. When this variable is non-nil, IDLWAVE will store and reuse the class information. -The class stored can be checked and removed with `\\[idlwave-routine-info]' +The class stored can be checked and removed with \\[idlwave-routine-info] on the arrow. The default of this variable is nil, since the result of commands then @@ -3891,7 +3891,7 @@ you specify /." (while (and item) ;; ;; Call etags - (if (not (string-match "^[ \\t]*$" item)) + (if (not (string-match "^[ \t]*$" item)) (progn (message "%s" (concat "Tagging " item "...")) (setq errbuf (get-buffer-create "*idltags-error*")) @@ -4311,10 +4311,7 @@ automatically when called interactively. When you need routine information updated immediately, leave NO-CONCATENATE nil." (interactive "P\np") ;; Stop any idle processing - (if (or (and (fboundp 'itimerp) - (itimerp idlwave-load-rinfo-idle-timer)) - (and (fboundp 'timerp) - (timerp idlwave-load-rinfo-idle-timer))) + (if (timerp idlwave-load-rinfo-idle-timer) (cancel-timer idlwave-load-rinfo-idle-timer)) (cond ((equal arg '(64)) @@ -4388,10 +4385,7 @@ information updated immediately, leave NO-CONCATENATE nil." (defvar idlwave-load-rinfo-steps-done (make-vector 6 nil)) (defvar idlwave-load-rinfo-idle-timer nil) (defun idlwave-start-load-rinfo-timer () - (if (or (and (fboundp 'itimerp) - (itimerp idlwave-load-rinfo-idle-timer)) - (and (fboundp 'timerp) - (timerp idlwave-load-rinfo-idle-timer))) + (if (timerp idlwave-load-rinfo-idle-timer) (cancel-timer idlwave-load-rinfo-idle-timer)) (setq idlwave-load-rinfo-steps-done (make-vector 6 nil)) (setq idlwave-load-rinfo-idle-timer nil) @@ -4653,7 +4647,7 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.") (setcar alias (car x)) (push alias idlwave-system-routines))) (cl-loop for x in remove-list do - (delq x idlwave-system-routines)))) + (setq idlwave-system-routines (delq x idlwave-system-routines))))) (defun idlwave-convert-xml-clean-sysvar-aliases (aliases) ;; Duplicate and trim original routine aliases from rinfo list @@ -4666,7 +4660,8 @@ Gets set in cached XML rinfo, or `idlw-rinfo.el'.") (setcar alias (car x)) (push alias idlwave-system-variables-alist))) (cl-loop for x in remove-list do - (delq x idlwave-system-variables-alist)))) + (setq idlwave-system-variables-alist + (delq x idlwave-system-variables-alist))))) (defun idlwave-xml-create-sysvar-alist (xml-entry) @@ -5340,7 +5335,6 @@ directories and save the routine info. (idlwave-path-alist-remove-flag dir-entry 'user))) (idlwave-scan-user-lib-files path-alist))) -(defvar font-lock-mode) (defun idlwave-scan-user-lib-files (path-alist) ;; Scan the PRO files in PATH-ALIST and store the info in the user catalog (let* ((idlwave-scanning-lib t) @@ -6898,7 +6892,7 @@ If these don't exist, a letter in the string is automatically selected." ;; Display prompt and wait for quick reply (message "%s[%s]" prompt (mapconcat (lambda(x) (char-to-string (car x))) - keys-alist "")) + keys-alist)) (if (sit-for delay) ;; No quick reply: Show help (save-window-excursion @@ -7964,7 +7958,7 @@ demand _EXTRA in the keyword list." ;; If this is the OBJ_NEW function, try to figure out the class and use ;; the keywords from the corresponding INIT method. (if (and (equal (upcase name) "OBJ_NEW") - (derived-mode-p 'idlwave-mode 'idlwave-shell-mode)) + (derived-mode-p '(idlwave-mode idlwave-shell-mode))) (let* ((bos (save-excursion (idlwave-beginning-of-statement) (point))) (string (buffer-substring bos (point))) (case-fold-search t) @@ -8756,11 +8750,12 @@ This expects NAME TYPE IDLWAVE-TWIN-CLASS to be bound to the right values." (defun idlwave-count-eq (elt list) "How often is ELT in LIST?" - (length (delq nil (mapcar (lambda (x) (eq x elt)) list)))) + (declare (obsolete nil "30.1")) + (seq-count (lambda (x) (eq x elt)) list)) (defun idlwave-count-memq (elt alist) "How often is ELT a key in ALIST?" - (length (delq nil (mapcar (lambda (x) (eq (car x) elt)) alist)))) + (seq-count (lambda (x) (eq (car x) elt)) alist)) (defun idlwave-syslib-p (file) "Non-nil if FILE is in the system library." |