# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1264024526 0
# Node ID 61b4d7e0482878bb58776304ad3346442146099e
# Parent  d16c45d89283ec0b77657d05e7a2edca03b0ddc3# Parent  200d1ac9090ad41b765b4d0aa016e62fafd7fd15
Merge from mainline.

diff -r d16c45d89283 -r 61b4d7e04828 admin/ChangeLog
--- a/admin/ChangeLog	Tue Jan 19 22:56:21 2010 +0000
+++ b/admin/ChangeLog	Wed Jan 20 21:55:26 2010 +0000
@@ -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 -r d16c45d89283 -r 61b4d7e04828 admin/revdiff
--- a/admin/revdiff	Tue Jan 19 22:56:21 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d16c45d89283 -r 61b4d7e04828 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jan 19 22:56:21 2010 +0000
+++ b/lisp/ChangeLog	Wed Jan 20 21:55:26 2010 +0000
@@ -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 -r d16c45d89283 -r 61b4d7e04828 lisp/dired-aux.el
--- a/lisp/dired-aux.el	Tue Jan 19 22:56:21 2010 +0000
+++ b/lisp/dired-aux.el	Wed Jan 20 21:55:26 2010 +0000
@@ -2308,7 +2308,7 @@
     (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 -r d16c45d89283 -r 61b4d7e04828 lisp/dired.el
--- a/lisp/dired.el	Tue Jan 19 22:56:21 2010 +0000
+++ b/lisp/dired.el	Wed Jan 20 21:55:26 2010 +0000
@@ -3517,7 +3517,7 @@
 ;;;;;;  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 @@
 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 -r d16c45d89283 -r 61b4d7e04828 lisp/indent.el
--- a/lisp/indent.el	Tue Jan 19 22:56:21 2010 +0000
+++ b/lisp/indent.el	Wed Jan 20 21:55:26 2010 +0000
@@ -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 @@
 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 -r d16c45d89283 -r 61b4d7e04828 lisp/term.el
--- a/lisp/term.el	Tue Jan 19 22:56:21 2010 +0000
+++ b/lisp/term.el	Wed Jan 20 21:55:26 2010 +0000
@@ -1208,8 +1208,17 @@
 
 (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 -r d16c45d89283 -r 61b4d7e04828 src/ChangeLog
--- a/src/ChangeLog	Tue Jan 19 22:56:21 2010 +0000
+++ b/src/ChangeLog	Wed Jan 20 21:55:26 2010 +0000
@@ -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 -r d16c45d89283 -r 61b4d7e04828 src/coding.c
--- a/src/coding.c	Tue Jan 19 22:56:21 2010 +0000
+++ b/src/coding.c	Wed Jan 20 21:55:26 2010 +0000
@@ -7417,7 +7417,8 @@
 	{
 	  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;