comparison lisp/emacs-lisp/lisp-mode.el @ 90016:ff0e824afa37

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-57 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-594 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-598 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-599 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-600 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-602 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-603 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-604 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-609 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-610 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-42 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-43 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-44 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49 Add {arch}/=commit-merge-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50 {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes
author Miles Bader <miles@gnu.org>
date Thu, 14 Oct 2004 08:50:09 +0000
parents cce1c0ee76ee b1bdc11085c9
children cb67264d6096
comparison
equal deleted inserted replaced
90015:9ee566735998 90016:ff0e824afa37
1 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands 1 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands
2 2
3 ;; Copyright (C) 1985,86,1999,2000,01,03,2004 Free Software Foundation, Inc. 3 ;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004
4 ;; Free Software Foundation, Inc.
4 5
5 ;; Maintainer: FSF 6 ;; Maintainer: FSF
6 ;; Keywords: lisp, languages 7 ;; Keywords: lisp, languages
7 8
8 ;; This file is part of GNU Emacs. 9 ;; This file is part of GNU Emacs.
1151 If any of the current line is a comment, fill the comment or the 1152 If any of the current line is a comment, fill the comment or the
1152 paragraph of it that point is in, preserving the comment's indentation 1153 paragraph of it that point is in, preserving the comment's indentation
1153 and initial semicolons." 1154 and initial semicolons."
1154 (interactive "P") 1155 (interactive "P")
1155 (or (fill-comment-paragraph justify) 1156 (or (fill-comment-paragraph justify)
1156 ;; Point is on a program line (a line no comment); we are interested 1157 ;; Since fill-comment-paragraph returned nil, that means we're not in
1158 ;; a comment: Point is on a program line; we are interested
1157 ;; particularly in docstring lines. 1159 ;; particularly in docstring lines.
1158 ;; 1160 ;;
1159 ;; We bind `paragraph-start' and `paragraph-separate' temporarily. They 1161 ;; We bind `paragraph-start' and `paragraph-separate' temporarily. They
1160 ;; are buffer-local, but we avoid changing them so that they can be set 1162 ;; are buffer-local, but we avoid changing them so that they can be set
1161 ;; to make `forward-paragraph' and friends do something the user wants. 1163 ;; to make `forward-paragraph' and friends do something the user wants.
1180 ;; and a quotation mark and ends with a period or (rarely) a comma. 1182 ;; and a quotation mark and ends with a period or (rarely) a comma.
1181 ;; 1183 ;;
1182 ;; The `fill-column' is temporarily bound to 1184 ;; The `fill-column' is temporarily bound to
1183 ;; `emacs-lisp-docstring-fill-column' if that value is an integer. 1185 ;; `emacs-lisp-docstring-fill-column' if that value is an integer.
1184 (let ((paragraph-start (concat paragraph-start 1186 (let ((paragraph-start (concat paragraph-start
1185 "\\|\\s-*\\([\(;:\"]\\|`\(\\)")) 1187 "\\|\\s-*\\([(;:\"]\\|`(\\|#'(\\)"))
1186 (paragraph-separate 1188 (paragraph-separate
1187 (concat paragraph-separate "\\|\\s-*\".*[,\\.]$")) 1189 (concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
1188 (fill-column (if (integerp emacs-lisp-docstring-fill-column) 1190 (fill-column (if (integerp emacs-lisp-docstring-fill-column)
1189 emacs-lisp-docstring-fill-column 1191 emacs-lisp-docstring-fill-column
1190 fill-column))) 1192 fill-column)))
1225 (forward-line 1) (point)) 1227 (forward-line 1) (point))
1226 nil nil state)))))) 1228 nil nil state))))))
1227 1229
1228 (provide 'lisp-mode) 1230 (provide 'lisp-mode)
1229 1231
1230 ;;; arch-tag: 414c7f93-c245-4b77-8ed5-ed05ef7ff1bf 1232 ;; arch-tag: 414c7f93-c245-4b77-8ed5-ed05ef7ff1bf
1231 ;;; lisp-mode.el ends here 1233 ;;; lisp-mode.el ends here