* lisp/version.el (emacs-repository-get-version):

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

diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 858d3298a65e1ec8b42a81e63be8afb6aaa982f2..19d0473c42d927aa56330ed0792c866545bc299d 100644 (file)
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -1,9 +1,9 @@
 ;;; cmacexp.el --- expand C macros in a region
 
-;; Copyright (C) 1992, 1994, 1996, 2000-2013 Free Software Foundation,
+;; Copyright (C) 1992, 1994, 1996, 2000-2015 Free Software Foundation,
 ;; Inc.
 
-;; Author: Francesco Potorti` <pot@gnu.org>
+;; Author: Francesco Potortì <pot@gnu.org>
 ;; Adapted-By: ESR
 ;; Keywords: c
 
@@ -70,7 +70,7 @@
 ;; BUG REPORTS =======================================================
 
 ;; Please report bugs, suggestions, complaints and so on to
-;; pot@gnu.org (Francesco Potorti`).
+;; bug-gnu-emacs@gnu.org and pot@gnu.org (Francesco Potortì).
 
 ;; IMPROVEMENTS OVER emacs 18.xx cmacexp.el ==========================
 
@@ -364,8 +364,8 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
            ;; Find and delete the mark of the start of the expansion.
            ;; Look for `# nn "file.c"' lines and delete them.
            (goto-char (point-min))
-           (search-forward startmarker)
-           (delete-region 1 (point)))
+            (if (search-forward startmarker nil t)
+                (delete-region 1 (point))))
          (while (re-search-forward (concat "^# [0-9]+ \""
                                            (regexp-quote filename)
                                            "\"") nil t)
@@ -404,3 +404,7 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
       (kill-buffer outbuf))))
 
 ;;; cmacexp.el ends here
+
+;; Local Variables:
+;; coding: utf-8
+;; End: