Mercurial > emacs
comparison lisp/emacs-lisp/lisp-mode.el @ 76880:def0f242e449
(lisp-fill-paragraph): Only obey emacs-lisp-docstring-fill-column in
emacs-lisp-mode.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sun, 01 Apr 2007 19:34:21 +0000 |
parents | b72eb510e3d7 |
children | 36ddacf0d44b 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
76879:d703606e395a | 76880:def0f242e449 |
---|---|
1278 ;; `emacs-lisp-docstring-fill-column' if that value is an integer. | 1278 ;; `emacs-lisp-docstring-fill-column' if that value is an integer. |
1279 (let ((paragraph-start (concat paragraph-start | 1279 (let ((paragraph-start (concat paragraph-start |
1280 "\\|\\s-*\\([(;:\"]\\|`(\\|#'(\\)")) | 1280 "\\|\\s-*\\([(;:\"]\\|`(\\|#'(\\)")) |
1281 (paragraph-separate | 1281 (paragraph-separate |
1282 (concat paragraph-separate "\\|\\s-*\".*[,\\.]$")) | 1282 (concat paragraph-separate "\\|\\s-*\".*[,\\.]$")) |
1283 (fill-column (if (integerp emacs-lisp-docstring-fill-column) | 1283 (fill-column (if (and (integerp emacs-lisp-docstring-fill-column) |
1284 (derived-mode-p 'emacs-lisp-mode)) | |
1284 emacs-lisp-docstring-fill-column | 1285 emacs-lisp-docstring-fill-column |
1285 fill-column))) | 1286 fill-column))) |
1286 (fill-paragraph justify)) | 1287 (fill-paragraph justify)) |
1287 ;; Never return nil. | 1288 ;; Never return nil. |
1288 t)) | 1289 t)) |