(save-abbrevs, save-some-buffers): Don't ask the user

[gnu-emacs] / lisp / align.el

diff --git a/lisp/align.el b/lisp/align.el
index 40c3decf8f2ee43c0efe2e2f5722d6ca33c3e0fe..ad4bd039661edc04a85913e3a9326b211845338b 100644 (file)
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -1,10 +1,9 @@
-;;; align --- align text to a specific column, by regexp
+;;; align.el --- align text to a specific column, by regexp
 
 ;; Copyright (C) 1999, 2000 Free Sofware Foundation
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: convenience languages lisp
-;; X-URL: http://www.emacs.org/~johnw/emacs.html
 
 ;; This file is part of GNU Emacs.
 
@@ -122,6 +121,7 @@
 
 (defgroup align nil
   "Align text to a specific column, by regexp."
+  :version "21.1"
   :group 'fill)
 
 ;;; User Variables:
@@ -872,7 +872,8 @@ on the format of these lists."
   (interactive "r")
   (let ((separator
         (or separate
-            (if (symbolp align-region-separate)
+            (if (and (symbolp align-region-separate)
+                     (boundp align-region-separate))
                 (symbol-value align-region-separate)
               align-region-separate)
             'entire)))
@@ -1037,7 +1038,8 @@ to be colored."
 (defun align-newline-and-indent ()
   "A replacement function for `newline-and-indent', aligning as it goes."
   (interactive)
-  (let ((separate (or (if (symbolp align-region-separate)
+  (let ((separate (or (if (and (symbolp align-region-separate)
+                              (boundp align-region-separate))
                          (symbol-value align-region-separate)
                        align-region-separate)
                      'entire))