[Emacs-diffs] /srv/bzr/emacs/trunk r106612: align.el marker fix.

[Glenn Morris]

------------------------------------------------------------
revno: 106612
fixes bug(s): http://debbugs.gnu.org/10216
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2011-12-04 18:47:53 -0800
message:
  align.el marker fix.
  
  * lisp/align.el (align--set-marker): Add doc-string.
  Don't try to move something that is not a marker. 
  Eg the first call from align-region passes eol == 0.
modified:
  lisp/ChangeLog
  lisp/align.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-12-04 19:41:44 +0000
+++ b/lisp/ChangeLog    2011-12-05 02:47:53 +0000
@@ -1,3 +1,8 @@
+2011-12-05  Glenn Morris  <address@hidden>
+
+       * align.el (align--set-marker): Add doc-string.
+       Don't try to move something that is not a marker.  (Bug#10216)
+
 2011-12-04  Glenn Morris  <address@hidden>
 
        * calendar/appt.el (appt-add): Rewrite the interactive-spec to avoid

=== modified file 'lisp/align.el'
--- a/lisp/align.el     2011-11-29 20:21:28 +0000
+++ b/lisp/align.el     2011-12-05 02:47:53 +0000
@@ -1247,7 +1247,9 @@
        (setq areas (cdr areas))))))
 
 (defmacro align--set-marker (marker-var pos &optional type)
-  `(if ,marker-var
+  "If MARKER-VAR is a marker, move it to position POS.
+Otherwise, create a new marker at position POS, with type TYPE."
+  `(if (markerp ,marker-var)
        (move-marker ,marker-var ,pos)
      (setq ,marker-var (copy-marker ,pos ,type))))