[Emacs-diffs] /srv/bzr/emacs/trunk r104089: ispell.el (ispell-add-per-file-word-list): Protect against `nil' value of `comment-start' (Bug#8579).

[Agustin Martin]

------------------------------------------------------------
revno: 104089
fixes bug(s): http://debbugs.gnu.org/8579
committer: Agustin Martin <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-03 13:08:15 +0200
message:
  ispell.el (ispell-add-per-file-word-list):  Protect against `nil' value of 
`comment-start' (Bug#8579).
modified:
  lisp/ChangeLog
  lisp/textmodes/ispell.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-03 03:34:26 +0000
+++ b/lisp/ChangeLog    2011-05-03 11:08:15 +0000
@@ -1,3 +1,8 @@
+2011-05-03  Dirk Ullrich  <address@hidden>  (tiny change)
+
+        * textmodes/ispell.el (ispell-add-per-file-word-list):
+        Protect against `nil' value of `comment-start' (Bug#8579).
+
 2011-05-03  Leo Liu  <address@hidden>
 
        * isearch.el (isearch-yank-pop): New command.

=== modified file 'lisp/textmodes/ispell.el'
--- a/lisp/textmodes/ispell.el  2011-05-03 01:48:32 +0000
+++ b/lisp/textmodes/ispell.el  2011-05-03 11:08:15 +0000
@@ -3915,14 +3915,18 @@
                  (progn
                    (open-line 1)
                    (unless found (newline))
-                   (insert (if (fboundp 'comment-padright)
-                                ;; Try and use the proper comment marker,
-                                ;; e.g. ";;" rather than ";".
-                                (comment-padright comment-start
-                                                  (comment-add nil))
-                              comment-start)
-                            " " ispell-words-keyword)
-                   (if (> (length comment-end) 0)
+                   (insert (if comment-start
+                                (progn
+                                  (if (fboundp 'comment-padright)
+                                      ;; Try and use the proper comment marker,
+                                      ;; e.g. ";;" rather than ";".
+                                      (comment-padright comment-start
+                                                        (comment-add nil))
+                                    comment-start)
+                                  " ")
+                              "")
+                            ispell-words-keyword)
+                    (if (and comment-end (> (length comment-end) 0))
                        (save-excursion
                          (newline)
                          (insert comment-end)))))