[Emacs-diffs] /srv/bzr/emacs/trunk r112768: idlwave-concatenate-rinfo-lists fix

[Glenn Morris]

------------------------------------------------------------
revno: 112768
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-29 00:18:09 -0700
message:
  idlwave-concatenate-rinfo-lists fix
  
  * 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.
modified:
  lisp/ChangeLog
  lisp/progmodes/idlwave.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-29 06:50:48 +0000
+++ b/lisp/ChangeLog    2013-05-29 07:18:09 +0000
@@ -8,6 +8,9 @@
 
 2013-05-29  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/progmodes/idlwave.el'
--- a/lisp/progmodes/idlwave.el 2013-05-29 06:44:19 +0000
+++ b/lisp/progmodes/idlwave.el 2013-05-29 07:18:09 +0000
@@ -5078,11 +5078,14 @@
   ;; 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.