(ibuffer-compressed-file-name-regexp): Avoid loading

[gnu-emacs] / lisp / align.el

diff --git a/lisp/align.el b/lisp/align.el
index 2cbc43e38d3d36f7bf93633f4fb4e18801df6b2a..b40f96e7f83991ed18d033b4204c78cbae89a018 100644 (file)
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -1,7 +1,7 @@
 ;;; align.el --- align text to a specific column, by regexp
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
 ;;; align.el --- align text to a specific column, by regexp
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,

-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.

 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: convenience languages lisp
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: convenience languages lisp


@@ -559,7 +559,7 @@ The possible settings for `align-region-separate' are:
     ;; With a numeric prefix argument, or C-u, space delimited text
     ;; tables will be aligned.
     (text-column
     ;; With a numeric prefix argument, or C-u, space delimited text
     ;; tables will be aligned.
     (text-column

-     (regexp   . "\\(^\\|\\S-\\)\\(\\s-+\\)\\(\\S-\\|$\\)")
+     (regexp   . "\\(^\\|\\S-\\)\\([ \t]+\\)\\(\\S-\\|$\\)")

      (group    . 2)
      (modes    . align-text-modes)
      (repeat   . t)
      (group    . 2)
      (modes    . align-text-modes)
      (repeat   . t)


@@ -931,8 +931,7 @@ using a REGEXP like \"(\". All you would have to do is to mark the
 region, call `align-regexp' and type in that regular expression."
   (interactive
    (append
 region, call `align-regexp' and type in that regular expression."
   (interactive
    (append

-    (list (min (point) (mark))
-         (max (point) (mark)))
+    (list (region-beginning) (region-end))

     (if current-prefix-arg
        (list (read-string "Complex align using regexp: "
                           "\\(\\s-*\\)")
     (if current-prefix-arg
        (list (read-string "Complex align using regexp: "
                           "\\(\\s-*\\)")


@@ -988,8 +987,7 @@ list of rules (see `align-rules-list'), it can be used to override the
 default alignment rules that would have been used to identify the text
 to be colored."
   (interactive
 default alignment rules that would have been used to identify the text
 to be colored."
   (interactive

-   (list (min (mark) (point))
-        (max (mark) (point))
+   (list (region-beginning) (region-end)

         (completing-read
          "Title of rule to highlight: "
          (mapcar
         (completing-read
          "Title of rule to highlight: "
          (mapcar