diff options
author | Kenichi Handa <handa@m17n.org> | 2010-01-21 13:14:47 +0900 |
---|---|---|
committer | Kenichi Handa <handa@m17n.org> | 2010-01-21 13:14:47 +0900 |
commit | 7d5d1c835356d55244565fe1c20f0aca0da4f794 (patch) | |
tree | 8c2f7a3260b1404c2f52981e89e7c704da3271c7 | |
parent | e69e4c5565974932241a68d3989090ef0798dbe9 (diff) | |
parent | bdd1870b47e351dadc32b6e9d7dd64a49f653944 (diff) | |
download | emacs-7d5d1c835356d55244565fe1c20f0aca0da4f794.tar.gz |
from trunk
-rw-r--r-- | admin/ChangeLog | 5 | ||||
-rwxr-xr-x | admin/revdiff | 137 | ||||
-rw-r--r-- | lisp/ChangeLog | 8 | ||||
-rw-r--r-- | lisp/dired-aux.el | 2 | ||||
-rw-r--r-- | lisp/dired.el | 4 | ||||
-rw-r--r-- | lisp/indent.el | 10 | ||||
-rw-r--r-- | lisp/term.el | 13 | ||||
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/coding.c | 3 |
9 files changed, 41 insertions, 146 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 8fd3b828a71..a43dbe931f0 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2010-01-20 Glenn Morris <rgm@gnu.org> + + * revdiff: Remove file that only works with CVS, and isn't really + needed with Bazaar (given the in-built revision options of bzr diff). + 2010-01-12 Glenn Morris <rgm@gnu.org> * emacs-pretesters, make-announcement: Use bug-gnu-emacs rather diff --git a/admin/revdiff b/admin/revdiff deleted file mode 100755 index 7a1e93a64fe..00000000000 --- a/admin/revdiff +++ /dev/null @@ -1,137 +0,0 @@ -#! /usr/bin/perl - -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -# 2010 Free Software Foundation, Inc. -# -# This file is part of GNU Emacs. - -# GNU Emacs is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# GNU Emacs is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - - -use File::Basename; - -if (@ARGV < 3) -{ - print <<USAGE; -revdiff FILE OLD NEW - -Get a diff of FILE between revisions OLD and NEW. Store the -diff in a file named FILE-OLD-NEW.diff. - -If OLD is `-' use FILE's current revision for OLD. If OLD is -`-<number>', use the Nth revision before the current one for OLD. - -If NEW is +<number> or -<number>, build diffs between revisions OLD -and OLD +/- <number>. - -Examples: - -revdiff FILE - -1 get the latest change of FILE -revdiff FILE -1 +1 also gets the latest change of FILE -revdiff FILE 1.500 +2 get diffs 1.500-1.501 and 1.501-1.502. - -USAGE - exit 1; -} - -$file = shift @ARGV; -$old = shift @ARGV; - -sub diffit -{ - my ($old, $new) = @_; - print "cvs diff -r$old -r$new $file >$file-$old-$new.diff\n"; - system "cvs diff -r$old -r$new $file >$file-$old-$new.diff"; -} - -sub current_revision ($) -{ - my ($file) = @_; - my $dir = dirname ($file); - my $base = basename ($file); - my $entries = "$dir/CVS/Entries"; - die "Can't find $entries" unless -f $entries; - open (IN, "<$entries") or die "Cannot open $entries"; - my $rev; - while ($line = <IN>) - { - if ($line =~ m,/$base/([^/]+),) - { - $rev = $1; - break; - } - } - die "Cannot determine current revision of $file" unless $rev; - close (IN); - return $rev; -} - -if ($old eq "-") - { - $old = current_revision ($file); - } -elsif ($old =~ /^-(\d+)$/) - { - my $offset = $1; - $old = current_revision ($file); - die "Internal error" unless $old =~ /(.*)\.(\d+)$/; - my $minor = $2 - $offset; - $old = sprintf ("%d.%d", $1, $minor); - } - -while (@ARGV) - { - my $new = shift @ARGV; - if ($new =~ /^[+]\d+$/) - { - my $n = $new; - for ($i = 0; $i < $n; ++$i) - { - unless ($old =~ /(.*)\.(\d+)$/) - { - die "Internal error"; - } - my $j = $2 + 1; - $new = "$1.$j"; - diffit ($old, $new); - $old = $new; - } - } - elsif ($new =~ /^[-]\d+$/) - { - my $n = - $new; - for ($i = 0; $i < $n; ++$i) - { - unless ($old =~ /(.*)\.(\d+)$/) - { - die "Internal error"; - } - my $j = $2 - 1; - $new = "$1.$j"; - diffit ($new, $old); - $old = $new; - } - } - else - { - diffit ($old, $new); - $old = $new; - } - } - -# Local Variables: -# mode: cperl -# End: - -# arch-tag: 2798b20d-c7f2-4c78-8378-7bb529c36a09 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2f8bd1d0ac6..88e77852020 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2010-01-20 Chong Yidong <cyd@stupidchicken.com> + + * term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330). + +2010-01-20 Glenn Morris <rgm@gnu.org> + + * indent.el (tab-always-indent): Fix custom-type. + 2010-01-19 Alan Mackenzie <acm@muc.de> * progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 7c53c3d9461..62d6928c024 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -2308,7 +2308,7 @@ Use \\[dired-hide-all] to (un)hide all directories." (restore-buffer-modified-p modflag))) ;;;###autoload -(defun dired-hide-all (arg) +(defun dired-hide-all (&optional ignored) "Hide all subdirectories, leaving only their header lines. If there is already something hidden, make everything visible again. Use \\[dired-hide-subdir] to (un)hide a particular subdirectory." diff --git a/lisp/dired.el b/lisp/dired.el index d4bf1d019a0..1fc90c308b1 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3517,7 +3517,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "557aca1f6e86b39f1c7612ee123d5354") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "07676ea25af17f5d50cc5db4f53bddc0") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ @@ -3917,7 +3917,7 @@ Hide all subdirectories, leaving only their header lines. If there is already something hidden, make everything visible again. Use \\[dired-hide-subdir] to (un)hide a particular subdirectory. -\(fn ARG)" t nil) +\(fn &optional IGNORED)" t nil) (autoload 'dired-isearch-filenames-setup "dired-aux" "\ Set up isearch to search in Dired file names. diff --git a/lisp/indent.el b/lisp/indent.el index 12cf9c9bb5d..3f8353bd90c 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -1,7 +1,7 @@ ;;; indent.el --- indentation commands for Emacs -;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF @@ -55,7 +55,11 @@ was already indented, then try to complete the thing at point. Some programming language modes have their own variable to control this, e.g., `c-tab-always-indent', and do not respect this variable." :group 'indent - :type '(choice (const nil) (const t) (const always))) + :type '(choice + (const :tag "Always indent" t) + (const :tag "Indent if inside indentation, else TAB" nil) + (const :tag "Indent, or if already indented complete" complete))) + (defun indent-according-to-mode () "Indent line in proper way for current major mode. diff --git a/lisp/term.el b/lisp/term.el index a619ed6ad66..7cb364af622 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -1208,8 +1208,17 @@ without any interpretation." (defun term-send-raw-meta () (interactive) - (let* ((keys (this-command-keys)) - (char (aref keys (1- (length keys))))) + (let ((char last-input-event)) + (when (symbolp last-input-event) + ;; Convert `return' to C-m, etc. + (let ((tmp (get char 'event-symbol-elements))) + (when tmp + (setq char (car tmp))) + (when (symbolp char) + (setq tmp (get char 'ascii-character)) + (when tmp + (setq char tmp))))) + (setq char (event-basic-type char)) (term-send-raw-string (if (and (numberp char) (> char 127) (< char 256)) diff --git a/src/ChangeLog b/src/ChangeLog index 8ac8883cb3e..e2dbd939b6f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-01-20 Kenichi Handa <handa@m17n.org> + + * coding.c (consume_chars): If ! multibyte and the encoder is ccl, + treat the source as actual byte sequence. + 2010-01-19 Alan Mackenzie <acm@muc.de> Fix spurious before-change-functions invocation from (insert ?\n). diff --git a/src/coding.c b/src/coding.c index b3a51eb0c4c..935d32e6a58 100644 --- a/src/coding.c +++ b/src/coding.c @@ -7417,7 +7417,8 @@ consume_chars (coding, translation_table, max_lookup) { EMACS_INT bytes; - if (coding->encoder == encode_coding_raw_text) + if (coding->encoder == encode_coding_raw_text + || coding->encoder == encode_coding_ccl) c = *src++, pos++; else if ((bytes = MULTIBYTE_LENGTH (src, src_end)) > 0) c = STRING_CHAR_ADVANCE_NO_UNIFY (src), pos += bytes; |