(nroff-mode): Set indent-line-function.

(nroff-indent-line-function): New function.
(nroff-count-text-lines): Use nroff-forward-text-line rather than
obsolete alias.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 379593645330d3fe78383fdda8cb595176e0a767..ce984fb410c57baae7fc8d6a6a98d6f02d400337 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -21,6 +21,11 @@
        (footnote-roman-lower-regexp, footnote-roman-upper-regexp):
        Match multi-character footnotes.
 
+       * textmodes/nroff-mode.el (nroff-mode): Set indent-line-function.
+       (nroff-indent-line-function): New function.
+       (nroff-count-text-lines): Use nroff-forward-text-line rather than
+       obsolete alias.
+
 2007-10-31  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-open-connection-telnet)

diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index 18156071e1cbd2e7476be1ea6d4ce8199f184031..8297bb05827dc4370f5ec496c7cd5cb0fb8782dc 100644 (file)
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -130,6 +130,7 @@ closing requests for requests that are used in matched pairs."
   (set (make-local-variable 'comment-start-skip) "\\\\\"[ \t]*")
   (set (make-local-variable 'comment-column) 24)
   (set (make-local-variable 'comment-indent-function) 'nroff-comment-indent)
+  (set (make-local-variable 'indent-line-function) 'nroff-indent-line-function)
   (set (make-local-variable 'imenu-generic-expression) nroff-imenu-expression))
 
 (defun nroff-outline-level ()
@@ -161,6 +162,19 @@ Puts a full-stop before comments on a line by themselves."
                              9) 8)))))) ; add 9 to ensure at least two blanks
       (goto-char pt))))
 
+;; All this does is insert a "." at the start of comment-lines,
+;; for the sake of comment-dwim adding a new comment on an empty line.
+;; Hack! The right fix probably involves ;; comment-insert-comment-function,
+;; but comment-dwim does not call that for the empty line case.
+;; http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01869.html
+(defun nroff-indent-line-function ()
+  "Function for `indent-line-function' in `nroff-mode'."
+  (save-excursion
+    (forward-line 0)
+    (when (looking-at "[ \t]*\\\\\"[ \t]*") ; \# does not need this
+      (delete-horizontal-space)
+      (insert ?.))))
+
 (defun nroff-count-text-lines (start end &optional print)
   "Count lines in region, except for nroff request lines.
 All lines not starting with a period are counted up.
@@ -173,7 +187,7 @@ Noninteractively, return number of non-request lines from START to END."
       (save-restriction
        (narrow-to-region start end)
        (goto-char (point-min))
-       (- (buffer-size) (forward-text-line (buffer-size)))))))
+       (- (buffer-size) (nroff-forward-text-line (buffer-size)))))))
 
 (defun nroff-forward-text-line (&optional cnt)
   "Go forward one nroff text line, skipping lines of nroff requests.