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
This commit is contained in:
commit
91900dd736
134 changed files with 7873 additions and 1442 deletions
|
@ -1152,7 +1152,7 @@ of FORM by signalling the error at compile-time."
|
|||
(numberp (nth 1 form)))
|
||||
(list 'forward-word (eval (- (nth 1 form)))))
|
||||
((= 1 (safe-length form))
|
||||
'(forward-char -1))
|
||||
'(forward-word -1))
|
||||
(t form)))
|
||||
|
||||
(put 'char-before 'byte-optimizer 'byte-optimize-char-before)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands
|
||||
|
||||
;; Copyright (C) 1985,86,1999,2000,01,03,2004 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004
|
||||
;; Free Software Foundation, Inc.
|
||||
|
||||
;; Maintainer: FSF
|
||||
;; Keywords: lisp, languages
|
||||
|
@ -1153,7 +1154,8 @@ paragraph of it that point is in, preserving the comment's indentation
|
|||
and initial semicolons."
|
||||
(interactive "P")
|
||||
(or (fill-comment-paragraph justify)
|
||||
;; Point is on a program line (a line no comment); we are interested
|
||||
;; Since fill-comment-paragraph returned nil, that means we're not in
|
||||
;; a comment: Point is on a program line; we are interested
|
||||
;; particularly in docstring lines.
|
||||
;;
|
||||
;; We bind `paragraph-start' and `paragraph-separate' temporarily. They
|
||||
|
@ -1182,7 +1184,7 @@ and initial semicolons."
|
|||
;; The `fill-column' is temporarily bound to
|
||||
;; `emacs-lisp-docstring-fill-column' if that value is an integer.
|
||||
(let ((paragraph-start (concat paragraph-start
|
||||
"\\|\\s-*\\([\(;:\"]\\|`\(\\)"))
|
||||
"\\|\\s-*\\([(;:\"]\\|`(\\|#'(\\)"))
|
||||
(paragraph-separate
|
||||
(concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
|
||||
(fill-column (if (integerp emacs-lisp-docstring-fill-column)
|
||||
|
@ -1227,5 +1229,5 @@ means don't indent that line."
|
|||
|
||||
(provide 'lisp-mode)
|
||||
|
||||
;;; arch-tag: 414c7f93-c245-4b77-8ed5-ed05ef7ff1bf
|
||||
;; arch-tag: 414c7f93-c245-4b77-8ed5-ed05ef7ff1bf
|
||||
;;; lisp-mode.el ends here
|
||||
|
|
|
@ -75,17 +75,19 @@ The place mark goes is the same place \\[forward-sexp] would
|
|||
move to with the same argument.
|
||||
If this command is repeated, it marks the next ARG sexps after the ones
|
||||
already marked."
|
||||
(interactive "p")
|
||||
(interactive "P")
|
||||
(cond ((and (eq last-command this-command) (mark t))
|
||||
(setq arg (if arg (prefix-numeric-value arg)
|
||||
(if (> (mark) (point)) 1 -1)))
|
||||
(set-mark
|
||||
(save-excursion
|
||||
(goto-char (mark))
|
||||
(forward-sexp (or arg 1))
|
||||
(forward-sexp arg)
|
||||
(point))))
|
||||
(t
|
||||
(push-mark
|
||||
(save-excursion
|
||||
(forward-sexp (or arg 1))
|
||||
(forward-sexp (prefix-numeric-value arg))
|
||||
(point))
|
||||
nil t))))
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue