Now on revision 111933.
------------------------------------------------------------
revno: 111933
committer: Dmitry Antipov <dmantipov@yandex.ru>
branch nick: trunk
timestamp: Mon 2013-03-04 11:41:01 +0400
message:
  * font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW.
  * ftfont.c (ftfont_shape_by_flt): Likewise.
  * w32uniscribe.c (uniscribe_shape): Likewise.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2013-03-02 21:05:52 +0000
+++ src/ChangeLog	2013-03-04 07:41:01 +0000
@@ -1,3 +1,9 @@
+2013-03-04  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* font.c (Ffont_get_glyphs): Use convenient LGLYPH_NEW.
+	* ftfont.c (ftfont_shape_by_flt): Likewise.
+	* w32uniscribe.c (uniscribe_shape): Likewise.
+
 2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 
 	The lock for FILE is now .#FILE or .#-FILE (Bug#13807).
@@ -208,6 +214,7 @@
 	of dumping Emacs.  Explain why.
 
 2013-02-20  Dmitry Antipov  <dmantipov@yandex.ru>
+
 	* search.c (find_newline): Return byte position in bytepos.
 	Adjust comment.
 	(find_next_newline_no_quit, find_before_next_newline):

=== modified file 'src/font.c'
--- src/font.c	2013-02-13 07:14:38 +0000
+++ src/font.c	2013-03-04 07:41:01 +0000
@@ -4716,7 +4716,7 @@
       code = font->driver->encode_char (font, c);
       if (code == FONT_INVALID_CODE)
 	continue;
-      g = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);
+      g = LGLYPH_NEW ();
       LGLYPH_SET_FROM (g, i);
       LGLYPH_SET_TO (g, i);
       LGLYPH_SET_CHAR (g, c);

=== modified file 'src/ftfont.c'
--- src/ftfont.c	2013-02-08 05:28:52 +0000
+++ src/ftfont.c	2013-03-04 07:41:01 +0000
@@ -2541,7 +2541,7 @@
 
       if (NILP (lglyph))
 	{
-	  lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);
+	  lglyph = LGLYPH_NEW ();
 	  LGSTRING_SET_GLYPH (lgstring, i, lglyph);
 	}
       LGLYPH_SET_FROM (lglyph, g->from);

=== modified file 'src/w32uniscribe.c'
--- src/w32uniscribe.c	2013-02-08 05:28:52 +0000
+++ src/w32uniscribe.c	2013-03-04 07:41:01 +0000
@@ -333,7 +333,7 @@
 
 		  if (NILP (lglyph))
 		    {
-		      lglyph = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);
+		      lglyph = LGLYPH_NEW ();
 		      LGSTRING_SET_GLYPH (lgstring, lglyph_index, lglyph);
 		    }
 		  /* Copy to a 32-bit data type to shut up the
------------------------------------------------------------
revno: 111932
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sun 2013-03-03 23:39:48 -0800
message:
  * semantic/wisent/wisent.el (wisent): Stick to ASCII in the ASCII art.
diff:
=== modified file 'lisp/cedet/ChangeLog'
--- lisp/cedet/ChangeLog	2013-03-04 07:25:17 +0000
+++ lisp/cedet/ChangeLog	2013-03-04 07:39:48 +0000
@@ -1,5 +1,7 @@
 2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* semantic/wisent/wisent.el (wisent): Stick to ASCII in the ASCII art.
+
 	* semantic/wisent/javat-wy.el: Regenerate.
 
 2012-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>

=== modified file 'lisp/cedet/semantic/wisent/wisent.el'
--- lisp/cedet/semantic/wisent/wisent.el	2013-01-01 09:11:05 +0000
+++ lisp/cedet/semantic/wisent/wisent.el	2013-03-04 07:39:48 +0000
@@ -46,8 +46,8 @@
            \\_         _/
             (     `o  `      (European ;-) Bison
              \\      ` /
-             (   D  ,¨       for Emacs!
-              ` ~ ,¨
+             (   D  ,\"       for Emacs!
+              ` ~ ,\"
                `\"\""
   :group 'semantic)
------------------------------------------------------------
revno: 111931
fixes bug: http://debbugs.gnu.org/13862
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Sun 2013-03-03 23:37:30 -0800
message:
  * files.el (inhibit-local-variables-regexps): Add .diff and .patch.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-03-03 10:31:01 +0000
+++ lisp/ChangeLog	2013-03-04 07:37:30 +0000
@@ -1,3 +1,8 @@
+2013-03-04  Glenn Morris  <rgm@gnu.org>
+
+	* files.el (inhibit-local-variables-regexps):
+	Add .diff and .patch.  (Bug#13862)
+
 2013-03-03  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-adb.el (tramp-adb-maybe-open-connection): Cache,

=== modified file 'lisp/files.el'
--- lisp/files.el	2013-02-25 14:29:41 +0000
+++ lisp/files.el	2013-03-04 07:37:30 +0000
@@ -2498,6 +2498,7 @@
 		      "\\.zoo\\'" "\\.[jew]ar\\'" "\\.xpi\\'" "\\.rar\\'"
 		      "\\.7z\\'"
 		      "\\.sx[dmicw]\\'" "\\.odt\\'"
+		      "\\.diff\\'" "\\.patch\\'"
 		      "\\.tiff?\\'" "\\.gif\\'" "\\.png\\'" "\\.jpe?g\\'"))
   "List of regexps matching file names in which to ignore local variables.
 This includes `-*-' lines as well as trailing \"Local Variables\" sections.
------------------------------------------------------------
revno: 111930
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sun 2013-03-03 23:25:17 -0800
message:
  Fix encoding problem in javat-wy.el.
  
  * admin/grammars/java-tags.wy (CHAR): Remove "('\u0000' to '\uffff')"
  from summary, as this causes javat-wy.el to contain both a null byte
  and a byte sequence that is not valid UTF-8, which is inconvenient.
  * lisp/cedet/semantic/wisent/javat-wy.el: Regenerate.
diff:
=== modified file 'admin/ChangeLog'
--- admin/ChangeLog	2013-03-03 07:26:39 +0000
+++ admin/ChangeLog	2013-03-04 07:25:17 +0000
@@ -1,3 +1,9 @@
+2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* grammars/java-tags.wy (CHAR): Remove "('\u0000' to '\uffff')"
+	from summary, as this causes javat-wy.el to contain both a null byte
+	and a byte sequence that is not valid UTF-8, which is inconvenient.
+
 2013-03-03  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.

=== modified file 'admin/grammars/java-tags.wy'
--- admin/grammars/java-tags.wy	2013-01-01 09:11:05 +0000
+++ admin/grammars/java-tags.wy	2013-03-04 07:25:17 +0000
@@ -154,7 +154,7 @@
 
 %keyword CHAR         "char"
 %put     CHAR summary
-"Integral primitive type ('\u0000' to '\uffff') (0 to 65535)"
+"Integral primitive type (0 to 65535)"
 
 %keyword CLASS        "class"
 %put     CLASS summary
@@ -312,7 +312,7 @@
 %keyword WHILE        "while"
 %put     WHILE summary
 "while (<expr>) <stmt> | do <stmt> while (<expr>);"
-  
+
 ;; --------------------------
 ;; Official javadoc line tags
 ;; --------------------------
@@ -340,27 +340,27 @@
 %keyword _AUTHOR      "@author"
 %put     _AUTHOR      javadoc (seq 1 usage (type))
 %keyword _VERSION     "@version"
-%put     _VERSION     javadoc (seq 2 usage (type)) 
+%put     _VERSION     javadoc (seq 2 usage (type))
 %keyword _PARAM       "@param"
-%put     _PARAM       javadoc (seq 3 usage (function) with-name t) 
+%put     _PARAM       javadoc (seq 3 usage (function) with-name t)
 %keyword _RETURN      "@return"
-%put     _RETURN      javadoc (seq 4 usage (function)) 
+%put     _RETURN      javadoc (seq 4 usage (function))
 %keyword _EXCEPTION   "@exception"
-%put     _EXCEPTION   javadoc (seq 5 usage (function) with-name t) 
+%put     _EXCEPTION   javadoc (seq 5 usage (function) with-name t)
 %keyword _THROWS      "@throws"
-%put     _THROWS      javadoc (seq 6 usage (function) with-name t) 
+%put     _THROWS      javadoc (seq 6 usage (function) with-name t)
 %keyword _SEE         "@see"
-%put     _SEE         javadoc (seq 7 usage (type function variable) opt t with-ref t) 
+%put     _SEE         javadoc (seq 7 usage (type function variable) opt t with-ref t)
 %keyword _SINCE       "@since"
-%put     _SINCE       javadoc (seq 8 usage (type function variable) opt t) 
+%put     _SINCE       javadoc (seq 8 usage (type function variable) opt t)
 %keyword _SERIAL      "@serial"
-%put     _SERIAL      javadoc (seq 9 usage (variable) opt t) 
+%put     _SERIAL      javadoc (seq 9 usage (variable) opt t)
 %keyword _SERIALDATA  "@serialData"
-%put     _SERIALDATA  javadoc (seq 10 usage (function) opt t) 
+%put     _SERIALDATA  javadoc (seq 10 usage (function) opt t)
 %keyword _SERIALFIELD "@serialField"
-%put     _SERIALFIELD javadoc (seq 11 usage (variable) opt t) 
+%put     _SERIALFIELD javadoc (seq 11 usage (variable) opt t)
 %keyword _DEPRECATED  "@deprecated"
-%put     _DEPRECATED  javadoc (seq 12 usage (type function variable) opt t) 
+%put     _DEPRECATED  javadoc (seq 12 usage (type function variable) opt t)
 
 %%
 
@@ -387,7 +387,7 @@
   ;
 
 ;;; Include file token
-;; ("FILE" include SYSTEM "DOCSTRING") 
+;; ("FILE" include SYSTEM "DOCSTRING")
 import_declaration
   : IMPORT qualified_name SEMICOLON
     (INCLUDE-TAG $2 nil)
@@ -476,7 +476,7 @@
   ;
 
 ;;; Function token
-;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") 
+;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
 constructor_declaration
   : modifiers_opt constructor_declarator throwsc_opt constructor_body
     (FUNCTION-TAG (car $2) nil (cdr $2)
@@ -491,11 +491,11 @@
   ;
 
 constructor_body
-  : block 
+  : block
   ;
 
 ;;; Function token
-;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") 
+;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING")
 method_declaration
   : modifiers_opt VOID method_declarator throwsc_opt method_body
     (FUNCTION-TAG (car $3) $2 (cdr $3) :typemodifiers $1 :throws $4)

=== modified file 'lisp/cedet/ChangeLog'
--- lisp/cedet/ChangeLog	2013-01-02 16:13:04 +0000
+++ lisp/cedet/ChangeLog	2013-03-04 07:25:17 +0000
@@ -1,3 +1,7 @@
+2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* semantic/wisent/javat-wy.el: Regenerate.
+
 2012-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* semantic/fw.el (semantic-make-local-hook, semantic-mode-line-update):

=== modified file 'lisp/cedet/semantic/wisent/javat-wy.el'
--- lisp/cedet/semantic/wisent/javat-wy.el	2013-01-01 09:11:05 +0000
+++ lisp/cedet/semantic/wisent/javat-wy.el	2013-03-04 07:25:17 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/wisent/javat-wy.el --- Generated parser support file
 
-;; Copyright (C) 2002, 2007, 2009-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -175,7 +175,7 @@
      ("continue" summary "continue [<label>] ;")
      ("const" summary "Unused reserved word")
      ("class" summary "Class declaration: class <name>")
-     ("char" summary "Integral primitive type ('' to 'ï¿¿') (0 to 65535)")
+     ("char" summary "Integral primitive type (0 to 65535)")
      ("catch" summary "try {<stmts>} catch(<parm>) {<stmts>} ... ")
      ("case" summary "switch(<expr>) {case <const-expr>: <stmts> ... }")
      ("byte" summary "Integral primitive type (-128 to 127)")
@@ -584,24 +584,6 @@
     ("]" RBRACK))
   )
 
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
-  "regexp analyzer for <symbol> tokens."
-  "\\(\\sw\\|\\s_\\)+"
-  nil
-  'IDENTIFIER)
-
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<unicode>-regexp-analyzer
-  "regexp analyzer for <unicode> tokens."
-  "\\\\u[0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
-  nil
-  'unicodecharacter)
-
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
-  "regexp analyzer for <number> tokens."
-  semantic-lex-number-expression
-  nil
-  'NUMBER_LITERAL)
-
 (define-lex-string-type-analyzer wisent-java-tags-wy--<punctuation>-string-analyzer
   "string analyzer for <punctuation> tokens."
   "\\(\\s.\\|\\s$\\|\\s'\\)+"
@@ -647,6 +629,24 @@
     (NOT . "!"))
   'punctuation)
 
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'IDENTIFIER)
+
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<unicode>-regexp-analyzer
+  "regexp analyzer for <unicode> tokens."
+  "\\\\u[0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
+  nil
+  'unicodecharacter)
+
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER_LITERAL)
+
 (define-lex-sexp-type-analyzer wisent-java-tags-wy--<string>-sexp-analyzer
   "sexp analyzer for <string> tokens."
   "\\s\""
------------------------------------------------------------
revno: 111929
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sun 2013-03-03 18:39:05 -0800
message:
  Add and/or fix coding tags for refcard sources.
diff:
=== modified file 'etc/refcards/cs-dired-ref.tex'
--- etc/refcards/cs-dired-ref.tex	2013-01-01 09:11:05 +0000
+++ etc/refcards/cs-dired-ref.tex	2013-03-04 02:39:05 +0000
@@ -1,4 +1,4 @@
-% Reference Card for Dired
+% Reference Card for Dired -*- coding: iso-latin-2 -*-
 
 % Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
@@ -396,4 +396,3 @@
 \copyrightnotice
 
 \bye
-

=== modified file 'etc/refcards/cs-refcard.tex'
--- etc/refcards/cs-refcard.tex	2013-01-01 09:11:05 +0000
+++ etc/refcards/cs-refcard.tex	2013-03-04 02:39:05 +0000
@@ -661,5 +661,5 @@
 
 % Local variables:
 % compile-command: "csplain cs-refcard"
+% coding: iso-latin-2
 % End:
-

=== modified file 'etc/refcards/cs-survival.tex'
--- etc/refcards/cs-survival.tex	2013-01-01 09:11:05 +0000
+++ etc/refcards/cs-survival.tex	2013-03-04 02:39:05 +0000
@@ -412,5 +412,5 @@
 
 % Local variables:
 % compile-command: "csplain survival"
+% coding: iso-latin-2
 % End:
-

=== modified file 'etc/refcards/fr-dired-ref.tex'
--- etc/refcards/fr-dired-ref.tex	2013-01-01 09:11:05 +0000
+++ etc/refcards/fr-dired-ref.tex	2013-03-04 02:39:05 +0000
@@ -1,4 +1,4 @@
-% Reference Card for Dired
+% Reference Card for Dired -*- coding: iso-latin-1 -*-
 
 % Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
@@ -410,4 +410,3 @@
 \copyrightnotice
 
 \bye
-

=== modified file 'etc/refcards/fr-refcard.tex'
--- etc/refcards/fr-refcard.tex	2013-01-01 09:11:05 +0000
+++ etc/refcards/fr-refcard.tex	2013-03-04 02:39:05 +0000
@@ -72,7 +72,7 @@
 \centerline{Traduction fran\c{c}aise de Micha\"el Cadilhac}
 % previously: Eric Jacoboni
 
-Vous pouvez faire et distribuer des copies de cette carte, modifiée ou
+Vous pouvez faire et distribuer des copies de cette carte, modifi\'ee ou
 non, pourvu que la note de copyright et cette note de permission
 soient conserv\'ees sur toutes les copies.
 
@@ -674,4 +674,3 @@
 % Local variables:
 % compile-command: "pdftex fr-refcard"
 % End:
-

=== modified file 'etc/refcards/fr-survival.tex'
--- etc/refcards/fr-survival.tex	2013-01-01 09:11:05 +0000
+++ etc/refcards/fr-survival.tex	2013-03-04 02:39:05 +0000
@@ -177,7 +177,7 @@
 Emacs divise son cadre en plusieurs parties~:
   une ligne de menu,
   une zone tampon contenant le texte \'edit\'e,
-  une ligne de mode d\'ecrivant le tampon de la fenêtre au-dessus d'elle,
+  une ligne de mode d\'ecrivant le tampon de la fen\^etre au-dessus d'elle,
   et un mini-tampon/zone d'\'echo sur la derni\`ere ligne.
 \askip
 \key{C-x C-c} quitte Emacs
@@ -417,4 +417,3 @@
 % Local variables:
 % compile-command: "pdftex survival"
 % End:
-

=== modified file 'etc/refcards/sk-dired-ref.tex'
--- etc/refcards/sk-dired-ref.tex	2013-01-01 09:11:05 +0000
+++ etc/refcards/sk-dired-ref.tex	2013-03-04 02:39:05 +0000
@@ -403,5 +403,5 @@
 
 % Local variables:
 % compile-command: "csplain sk-dired-ref"
+% coding: iso-latin-2
 % End:
-

=== modified file 'etc/refcards/sk-survival.tex'
--- etc/refcards/sk-survival.tex	2013-01-01 09:11:05 +0000
+++ etc/refcards/sk-survival.tex	2013-03-04 02:39:05 +0000
@@ -415,5 +415,5 @@
 
 % Local variables:
 % compile-command: "csplain sk-survival"
+% coding: iso-latin-2
 % End:
-
------------------------------------------------------------
revno: 111928
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Sun 2013-03-03 12:47:20 +0100
message:
  * tramp.texi (External methods): Tramp does not connect Android
  devices by itself.
diff:
=== modified file 'doc/misc/ChangeLog'
--- doc/misc/ChangeLog	2013-03-02 23:20:11 +0000
+++ doc/misc/ChangeLog	2013-03-03 11:47:20 +0000
@@ -1,3 +1,8 @@
+2013-03-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi (External methods): Tramp does not connect Android
+	devices by itself.
+
 2013-03-02  Bill Wohler  <wohler@newt.com>
 
 	Release MH-E manual version 8.5.

=== modified file 'doc/misc/tramp.texi'
--- doc/misc/tramp.texi	2013-03-03 06:40:21 +0000
+++ doc/misc/tramp.texi	2013-03-03 11:47:20 +0000
@@ -998,12 +998,19 @@
 @cindex method adb
 @cindex adb method
 
-This special method uses the Android Debug Bridge for connecting
+This special method uses the Android Debug Bridge for accessing
 Android devices.  The Android Debug Bridge must be installed locally.
 Some GNU/Linux distributions offer it for installation, otherwise it
-can be installed as part of the Android SDK.  If @command{adb} is not
-found via the @code{$PATH} environment variable, the variable
-@var{tramp-adb-program} must point to its absolute path.
+can be installed as part of the Android SDK.  If the @command{adb}
+program is not found via the @code{$PATH} environment variable, the
+variable @var{tramp-adb-program} must point to its absolute path.
+
+Tramp does not connect Android devices to @command{adb}.  This must be
+performed outside @value{emacsname}.  If there is exactly one Android
+device connected to @command{adb}, a host name is not needed in the
+remote file name.  The default @value{tramp} name to be used is
+@file{@trampfn{adb, , ,}} therefore.  Otherwise, one could find
+potential host names with the command @command{adb devices}.
 
 Usually, the @command{adb} method does not need any user name.  It
 runs under the permissions of the @command{adbd} process on the
@@ -1012,11 +1019,6 @@
 devices, especially with unrooted ones.  In that case, an error
 message is displayed.
 
-If there is exactly one Android device connected to the local machine,
-a host name is not needed.  The shortest @value{tramp} name to be used
-is @file{@trampfn{adb, , ,}} therefore.  Otherwise, one could find
-potential host names with the shell command @command{adb devices}.
-
 @end table
------------------------------------------------------------
revno: 111927
committer: Michael Albinus <michael.albinus@gmx.de>
branch nick: trunk
timestamp: Sun 2013-03-03 11:31:01 +0100
message:
  * net/tramp-adb.el (tramp-adb-maybe-open-connection): Cache,
  whether the "su" command is available on the device.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2013-03-01 21:12:26 +0000
+++ lisp/ChangeLog	2013-03-03 10:31:01 +0000
@@ -1,3 +1,8 @@
+2013-03-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-adb.el (tramp-adb-maybe-open-connection): Cache,
+	whether the "su" command is available on the device.
+
 2013-03-01  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-adb.el (tramp-adb-prompt): Extend regexp.

=== modified file 'lisp/net/tramp-adb.el'
--- lisp/net/tramp-adb.el	2013-03-01 21:12:26 +0000
+++ lisp/net/tramp-adb.el	2013-03-03 10:31:01 +0000
@@ -1074,6 +1074,13 @@
 	 (host (tramp-file-name-host vec))
 	 (user (tramp-file-name-user vec))
 	 (devices (mapcar 'cadr (tramp-adb-parse-device-names nil))))
+
+    ;; Maybe we know already that "su" is not supported.  We cannot
+    ;; use a connection property, because we have not checked yet
+    ;; whether it is still the same device.
+    (when (and user (not (tramp-get-file-property vec "" "su-command-p" t)))
+      (tramp-error vec 'file-error "Cannot switch to user `%s'" user))
+
     (unless
 	(and p (processp p) (memq (process-status p) '(run open)))
       (save-match-data
@@ -1133,7 +1140,9 @@
 	      (tramp-adb-send-command vec (format "su %s" user))
 	      (unless (zerop (tramp-adb-command-exit-status vec nil))
 		(delete-process p)
-		(tramp-error vec 'file-error "Cannot switch to user %s" user)))
+		(tramp-set-file-property vec "" "su-command-p" nil)
+		(tramp-error
+		 vec 'file-error "Cannot switch to user `%s'" user)))
 
 	    ;; Set "remote-path" connection property.  This is needed
 	    ;; for eshell.
------------------------------------------------------------
revno: 111926
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: trunk
timestamp: Sat 2013-03-02 23:26:39 -0800
message:
  * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.
  
  If there were a real need, it should be UTF-8 anyway.
diff:
=== modified file 'admin/ChangeLog'
--- admin/ChangeLog	2013-02-25 05:55:37 +0000
+++ admin/ChangeLog	2013-03-03 07:26:39 +0000
@@ -1,3 +1,8 @@
+2013-03-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.
+	If there were a real need, it should be UTF-8 anyway.
+
 2013-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Simplify data_start configuration (Bug#13783).

=== modified file 'admin/bzrmerge.el'
--- admin/bzrmerge.el	2013-01-01 09:11:05 +0000
+++ admin/bzrmerge.el	2013-03-03 07:26:39 +0000
@@ -320,7 +320,7 @@
                   ;; bzrmerge-add-metadata does not work when there
                   ;; are conflicts.
                   (display-warning 'bzrmerge "Resolve conflicts manually.
-¡BEWARE!  Important metadata is kept in this Emacs session!
+BEWARE!  Important metadata is kept in this Emacs session!
 Do not commit without re-running `M-x bzrmerge' first!"
                                    :warning bzrmerge-warning-buffer))
               (error "Resolve conflicts manually")))))