Mercurial > emacs
changeset 83034:759de0673597
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-70
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-74
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 03 Feb 2004 11:25:07 +0000 |
| parents | 3fed8a60d18c (current diff) f0be34d8f61f (diff) |
| children | fcf6fc349e0d |
| files | lisp/ChangeLog |
| diffstat | 5 files changed, 21 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Feb 02 22:15:35 2004 +0000 +++ b/lisp/ChangeLog Tue Feb 03 11:25:07 2004 +0000 @@ -1,3 +1,7 @@ +2004-02-02 Benjamin Rutt <brutt@bloomington.in.us> + + * diff-mode.el (diff-mode-shared-map): Bind q to `quit-window'. + 2004-02-02 David Kastrup <dak@gnu.org> * replace.el (perform-replace): Allow 'literal argument in
--- a/lisp/diff-mode.el Mon Feb 02 22:15:35 2004 +0000 +++ b/lisp/diff-mode.el Tue Feb 03 11:25:07 2004 +0000 @@ -127,7 +127,8 @@ ("r" . diff-restrict-view) ("R" . diff-reverse-direction) ("U" . diff-context->unified) - ("C" . diff-unified->context)) + ("C" . diff-unified->context) + ("q" . quit-window)) "Basic keymap for `diff-mode', bound to various prefix keys.") (easy-mmode-defmap diff-mode-map
--- a/lisp/progmodes/cperl-mode.el Mon Feb 02 22:15:35 2004 +0000 +++ b/lisp/progmodes/cperl-mode.el Tue Feb 03 11:25:07 2004 +0000 @@ -1,6 +1,6 @@ ;;; cperl-mode.el --- Perl code editing commands for Emacs -;; Copyright (C) 1985, 86, 87, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2003 +;; Copyright (C) 1985,86,87,91,92,93,94,95,96,97,98,99,2000,03,2004 ;; Free Software Foundation, Inc. ;; Author: Ilya Zakharevich and Bob Olson @@ -1064,9 +1064,6 @@ 'indent-sexp 'cperl-indent-exp cperl-mode-map global-map) (substitute-key-definition - 'fill-paragraph 'cperl-fill-paragraph - cperl-mode-map global-map) - (substitute-key-definition 'indent-region 'cperl-indent-region cperl-mode-map global-map) (substitute-key-definition @@ -1086,7 +1083,7 @@ ["End of function" end-of-defun t] ["Mark function" mark-defun t] ["Indent expression" cperl-indent-exp t] - ["Fill paragraph/comment" cperl-fill-paragraph t] + ["Fill paragraph/comment" fill-paragraph t] "----" ["Line up a construction" cperl-lineup (cperl-use-region-p)] ["Invert if/unless/while etc" cperl-invert-if-unless t] @@ -1464,6 +1461,7 @@ (setq paragraph-separate paragraph-start) (make-local-variable 'paragraph-ignore-fill-prefix) (setq paragraph-ignore-fill-prefix t) + (set (make-local-variable 'fill-paragraph-function) 'cperl-fill-paragraph) (make-local-variable 'indent-line-function) (setq indent-line-function 'cperl-indent-line) (make-local-variable 'require-final-newline) @@ -4255,11 +4253,11 @@ ;; Stolen from lisp-mode with a lot of improvements (defun cperl-fill-paragraph (&optional justify iteration) - "Like \\[fill-paragraph], but handle CPerl comments. + "Like `fill-paragraph', but handle CPerl comments. If any of the current line is a comment, fill the comment or the block of it that point is in, preserving the comment's initial indentation and initial hashes. Behaves usually outside of comment." - (interactive "P") + ;; (interactive "P") ; Only works when called from fill-paragraph. -stef (let (;; Non-nil if the current line contains a comment. has-comment @@ -4346,9 +4344,11 @@ (let ((c (save-excursion (beginning-of-line) (cperl-to-comment-or-eol) (point))) (s (memq (following-char) '(?\ ?\t))) marker) - (if (>= c (point)) nil + (if (>= c (point)) + ;; Don't break line inside code: only inside comment. + nil (setq marker (point-marker)) - (cperl-fill-paragraph) + (fill-paragraph nil) (goto-char marker) ;; Is not enough, sometimes marker is a start of line (if (bolp) (progn (re-search-forward "#+[ \t]*")
--- a/src/ChangeLog Mon Feb 02 22:15:35 2004 +0000 +++ b/src/ChangeLog Tue Feb 03 11:25:07 2004 +0000 @@ -1,3 +1,8 @@ +2004-02-02 Eli Zaretskii <eliz@elta.co.il> + + * fileio.c (Fcopy_file): If NEWNAME is a directory, expand the + basename of FILE relative to it, not FILE itself. + 2004-02-02 Kenichi Handa <handa@m17n.org> * coding.c (coding_restore_composition): Check invalid
--- a/src/fileio.c Mon Feb 02 22:15:35 2004 +0000 +++ b/src/fileio.c Tue Feb 03 11:25:07 2004 +0000 @@ -2407,7 +2407,7 @@ CHECK_STRING (newname); if (!NILP (Ffile_directory_p (newname))) - newname = Fexpand_file_name (file, newname); + newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname); else newname = Fexpand_file_name (newname, Qnil);