mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-07 23:10:28 -08:00
Code Issues Projects Releases Wiki Activity

(lisp-mode-variables): Prevent adaptive

Browse source 
filling from using prefix when filling a single-line docstring.
This commit is contained in:
Stefan Monnier 2005-07-04 20:13:45 +00:00
parent 0ea7c863fb
commit c13ce396ae
2 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lisp/ChangeLog
View file

@ -1,7 +1,16 @@
2005-07-04 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/lisp-mode.el (lisp-mode-variables): Prevent adaptive
filling from using prefix when filling a single-line docstring.
* progmodes/flymake.el: Remove useless eval-when-compile.
* arc-mode.el (archive-lzh-ogm): Reorder save excursion/restriction.
2005-07-04 Richard M. Stallman <rms@gnu.org> 2005-07-04 Richard M. Stallman <rms@gnu.org>
* textmodes/org.el (org-file-apps-defaults-gnu): * textmodes/org.el (org-file-apps-defaults-gnu):
Renamed from org-file-apps-defaults-linux. Rename from org-file-apps-defaults-linux.
(org-default-apps): Don't test system-type for `linux'. (org-default-apps): Don't test system-type for `linux'.
(org-file-apps): Doc fix. (org-file-apps): Doc fix.
@ -45,14 +54,12 @@
(org-recalc-marks, org-table-rotate-recalc-marks) (org-recalc-marks, org-table-rotate-recalc-marks)
(org-table-get-specials): Treat "^" and "_" marks. (org-table-get-specials): Treat "^" and "_" marks.
(org-table-justify-field-maybe): Optional argument NEW. (org-table-justify-field-maybe): Optional argument NEW.
(org-table-eval-formula): Parsing of the format simplified. New (org-table-eval-formula): Parsing of the format simplified.
modes C,I. Honor the %= parameter in the current table. Avoid New modes C,I. Honor the %= parameter in the current table.
unnecessary re-align by using the NEW argument to Avoid unnecessary re-align by using the NEW argument to
`org-table-justify-field-maybe'. `org-table-justify-field-maybe'.
(org-calc-default-modes): Default for date-format mimicks (org-calc-default-modes): Default for date-format mimicks org-mode.
org-mode. (org-agenda, org-timeline): Quote argument in org-agenda-redo-command.
(org-agenda, org-timeline): Quote argument in
`org-agenda-redo-command'.
2005-07-03 Luc Teirlinck <teirllm@auburn.edu> 2005-07-03 Luc Teirlinck <teirllm@auburn.edu>
@ -231,7 +238,7 @@
* emulation/tpu-edt.el (tpu-emacs19-p): Var deleted. * emulation/tpu-edt.el (tpu-emacs19-p): Var deleted.
All references simplified. All references simplified.
(tpu-lucid-emacs-p): Renamed from tpu-lucid-emacs19-p. Uses changed. (tpu-lucid-emacs-p): Rename from tpu-lucid-emacs19-p. Uses changed.
(zmacs-regions): Add defvar. (zmacs-regions): Add defvar.
(repeat-complex-command-map): Everything about that deleted. (repeat-complex-command-map): Everything about that deleted.
@ -252,7 +259,7 @@
* mail/rmailsum.el (rmail-summary-redo): Add defvar. * mail/rmailsum.el (rmail-summary-redo): Add defvar.
(rmail-summary-mode-map, rmail-summary-overlay): Defvars moved up. (rmail-summary-mode-map, rmail-summary-overlay): Defvars moved up.
(rmail-new-summary-line-count): Renamed from new-summary-line-count. (rmail-new-summary-line-count): Rename from new-summary-line-count.
Add defvar. Add defvar.
(rmail-summary-beginning-of-message): Use with-no-warnings. (rmail-summary-beginning-of-message): Use with-no-warnings.
(rmail-summary-first-message, rmail-summary-last-message): Likewise. (rmail-summary-first-message, rmail-summary-last-message): Likewise.

4
lisp/emacs-lisp/lisp-mode.el
View file

@ -172,6 +172,10 @@
(setq paragraph-ignore-fill-prefix t) (setq paragraph-ignore-fill-prefix t)
(make-local-variable 'fill-paragraph-function) (make-local-variable 'fill-paragraph-function)
(setq fill-paragraph-function 'lisp-fill-paragraph) (setq fill-paragraph-function 'lisp-fill-paragraph)
;; Adaptive fill mode gets the fill wrong for a one-line paragraph made of
;; a single docstring. Let's fix it here.
(set (make-local-variable 'adaptive-fill-function)
(lambda () (if (looking-at "\\s-+\"[^\n\"]+\"\\s-*$") "")))
;; Adaptive fill mode gets in the way of auto-fill, ;; Adaptive fill mode gets in the way of auto-fill,
;; and should make no difference for explicit fill ;; and should make no difference for explicit fill
;; because lisp-fill-paragraph should do the job. ;; because lisp-fill-paragraph should do the job.