Merge from emacs-23

[gnu-emacs] / lisp / progmodes / hideif.el

diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 01b406b1a25f7d2f40b092d3d6acb6420616922e..b4365d9ba1ae7db56949ed56293681b79f19aa82 100644 (file)
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -760,7 +760,7 @@ Point is left unchanged."
       (cond ((hif-looking-at-else)
             (setq else (point)))
            (t
-            (setq end (point)))) ; (save-excursion (end-of-line) (point))
+            (setq end (point)))) ; (line-end-position)
       ;; If found #else, look for #endif.
       (when else
        (while (progn
@@ -769,7 +769,7 @@ Point is left unchanged."
          (hif-ifdef-to-endif))
        (if (hif-looking-at-else)
            (error "Found two elses in a row?  Broken!"))
-       (setq end (point)))            ; (save-excursion (end-of-line) (point))
+       (setq end (point)))            ; (line-end-position)
       (hif-make-range start end else))))
 
 
@@ -1025,5 +1025,4 @@ Return as (TOP . BOTTOM) the extent of ifdef block."
 
 (provide 'hideif)
 
-;; arch-tag: c6381d17-a59a-483a-b945-658f22277981
 ;;; hideif.el ends here