Mercurial > emacs
comparison lisp/emacs-lisp/lisp-mode.el @ 90796:4ef881a120fe
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 675-697)
- Update from CVS
- Merge from gnus--rel--5.10
- Release ERC 5.2.
* gnus--rel--5.10 (patch 211-215)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 11 Apr 2007 00:17:47 +0000 |
| parents | 91bf6e05918b def0f242e449 |
| children | 988f1edc9674 |
comparison
equal
deleted
inserted
replaced
| 90795:b9182b6a90c9 | 90796:4ef881a120fe |
|---|---|
| 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)) |