[Emacs-diffs] emacs/lisp ChangeLog arc-mode.el emacs-lisp/re-...

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/08/28 18:35:29

Modified files:
        lisp           : ChangeLog arc-mode.el 
        lisp/emacs-lisp: re-builder.el 

Log message:
        * arc-mode.el (archive-mode):
        * emacs-lisp/re-builder.el (re-builder-unload-function):
          Protect against the default value of `major-mode' being nil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16043&r2=1.16044
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/arc-mode.el?cvsroot=emacs&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/re-builder.el?cvsroot=emacs&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16043
retrieving revision 1.16044
diff -u -b -r1.16043 -r1.16044
--- ChangeLog   28 Aug 2009 18:22:30 -0000      1.16043
+++ ChangeLog   28 Aug 2009 18:35:25 -0000      1.16044
@@ -1,5 +1,11 @@
 2009-08-28  Juanma Barranquero  <address@hidden>
 
+       * arc-mode.el (archive-mode):
+       * emacs-lisp/re-builder.el (re-builder-unload-function):
+       Protect against the default value of `major-mode' being nil.
+
+2009-08-28  Juanma Barranquero  <address@hidden>
+
        * international/ucs-normalize.el (ucs-normalize-sort, quick-check-list):
        Fix typos in docstrings.
 

Index: arc-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/arc-mode.el,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- arc-mode.el 28 Aug 2009 17:02:56 -0000      1.100
+++ arc-mode.el 28 Aug 2009 18:35:28 -0000      1.101
@@ -638,7 +638,7 @@
   ;; mode on and off.  You can corrupt things that way.
   (if (zerop (buffer-size))
       ;; At present we cannot create archives from scratch
-      (funcall (default-value 'major-mode))
+      (funcall (or (default-value 'major-mode) 'fundamental-mode))
     (if (and (not force) archive-files) nil
       (let* ((type (archive-find-type))
             (typename (capitalize (symbol-name type))))

Index: emacs-lisp/re-builder.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/re-builder.el,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- emacs-lisp/re-builder.el    28 Aug 2009 17:02:55 -0000      1.46
+++ emacs-lisp/re-builder.el    28 Aug 2009 18:35:29 -0000      1.47
@@ -720,7 +720,7 @@
       (remove-hook 'kill-buffer-hook 'reb-kill-buffer t)
       (when (reb-mode-buffer-p)
        (reb-delete-overlays)
-       (funcall (default-value 'major-mode)))))
+       (funcall (or (default-value 'major-mode) 'fundamental-mode)))))
   ;; continue standard unloading
   nil)