]> git.eshelyaron.com Git - emacs.git/commitdiff
idlwave-concatenate-rinfo-lists fix
authorGlenn Morris <rgm@gnu.org>
Wed, 29 May 2013 07:18:09 +0000 (00:18 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 29 May 2013 07:18:09 +0000 (00:18 -0700)
* progmodes/idlwave.el (idlwave-concatenate-rinfo-lists):
Handle idlwave-last-system-routine-info-cons-cell being nil.

This seems to prevent an error on typing `C-c TAB',
idlwave-update-routine-info, in an idlwave buffer.

lisp/ChangeLog
lisp/progmodes/idlwave.el

index 219e3d902ea6f26dae0999481977febb76e2d861..3fa1ffe40a717fa1c0085d2909d4a1f5ee2f53cc 100644 (file)
@@ -8,6 +8,9 @@
 
 2013-05-29  Glenn Morris  <rgm@gnu.org>
 
+       * progmodes/idlwave.el (idlwave-concatenate-rinfo-lists):
+       Handle idlwave-last-system-routine-info-cons-cell being nil.
+
        * progmodes/idlwave.el (idlwave-scan-user-lib-files)
        (idlwave-write-paths): Simplify via with-temp-buffer.
 
index cbcd2f9d10e4616024ed616db5bbb2cb4c708658..ba9a632b94922bbc5c843f640eeb920d02b4bda7 100644 (file)
@@ -5078,11 +5078,14 @@ Cache to disk for quick recovery."
   ;; The sequence here is important because earlier definitions shadow
   ;; later ones.  We assume that if things in the buffers are newer
   ;; then in the shell of the system, they are meant to be different.
-  (setcdr idlwave-last-system-routine-info-cons-cell
-         (append idlwave-buffer-routines
-                 idlwave-compiled-routines
-                 idlwave-library-catalog-routines
-                 idlwave-user-catalog-routines))
+  (let ((temp (append idlwave-buffer-routines
+                     idlwave-compiled-routines
+                     idlwave-library-catalog-routines
+                     idlwave-user-catalog-routines)))
+    ;; Not actually used for anything?
+    (if idlwave-last-system-routine-info-cons-cell
+       (setcdr idlwave-last-system-routine-info-cons-cell temp)
+      (setq idlwave-last-system-routine-info-cons-cell (cons temp nil))))
   (setq idlwave-class-alist nil)
 
   ;; Give a message with information about the number of routines we have.