auto upstream

6 files changed, 69 insertions, 45 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e569d4c5500..ecf3619db4b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (External methods): Move `adb' method here.
+
 2012-12-13  Glenn Morris  <rgm@gnu.org>
 
         * cl.texi (Modify Macros, Obsolete Macros): Now letf == cl-letf.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 4918321b171..317d440c0d1 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -742,16 +742,6 @@ expects PuTTY session names, calling @samp{plink -load @var{session}
 hasn't defined a user name.  Different port numbers must be defined in
 the session.
 
-
-@item @option{adb}
-@cindex method adb
-@cindex adb method
-
-This special method uses the Android Debug Bridge for connecting
-Android devices.  The Android Debug Bridge, part of the Android SDK,
-must be installed locally.  The variable @var{tramp-adb-sdk-dir} must
-be set to its installation directory.
-
 @end table
 
 
@@ -1041,6 +1031,17 @@ Windows, this method isn't available.  Instead, you can use UNC
 file names like @file{//melancholia/daniel$$/.emacs}.  The only
 disadvantage is that there's no possibility to specify another user
 name.
+
+
+@item @option{adb}
+@cindex method adb
+@cindex adb method
+
+This special method uses the Android Debug Bridge for connecting
+Android devices.  The Android Debug Bridge, part of the Android SDK,
+must be installed locally.  The variable @var{tramp-adb-sdk-dir} must
+be set to its installation directory.
+
 @end table
 
 
@@ -1089,6 +1090,7 @@ phones.  For the time being, @value{tramp} only supports OBEX over Bluetooth.
 The @option{synce} method allows communication with Windows Mobile
 devices.  Beside GVFS for mounting remote files and directories via
 FUSE, it also needs the SYNCE-GVFS plugin.
+
 @end table
 
 @defopt tramp-gvfs-methods
@@ -1596,6 +1598,7 @@ can return user names only.
 
 Finally, a function which parses @file{~/.netrc} like files.  This
 includes also @file{~/.authinfo}-style files.
+
 @end table
 
 If you want to keep your own data in a file, with your own structure,
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61ccbead17d..75387673f76 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-14  Julien Danjou  <julien@danjou.info>
+
+        * progmodes/sql.el (sql-mode-postgres-font-lock-keywords): Update
+        keywords list, data type and PL/pgSQL.
+
 2012-12-14  Dave Abrahams  <dave@boostpro.com>
 
         * vc/ediff-util.el (ediff-buffer-type): New function.
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 22ba55d9a08..9765b614b96 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -1930,7 +1930,7 @@ to add functions and PL/SQL keywords.")
      ;; Postgres non-reserved words
      (sql-font-lock-keywords-builder 'font-lock-builtin-face nil
 "abort" "absolute" "access" "action" "add" "admin" "after" "aggregate"
-"also" "alter" "always" "assertion" "assignment" "at" "backward"
+"also" "alter" "always" "assertion" "assignment" "at" "attribute" "backward"
 "before" "begin" "between" "by" "cache" "called" "cascade" "cascaded"
 "catalog" "chain" "characteristics" "checkpoint" "class" "close"
 "cluster" "coalesce" "comment" "comments" "commit" "committed"
@@ -1941,40 +1941,40 @@ to add functions and PL/SQL keywords.")
 "delimiters" "dictionary" "disable" "discard" "document" "domain"
 "drop" "each" "enable" "encoding" "encrypted" "enum" "escape"
 "exclude" "excluding" "exclusive" "execute" "exists" "explain"
-"external" "extract" "family" "first" "float" "following" "force"
+"extension" "external" "extract" "family" "first" "float" "following" "force"
 "forward" "function" "functions" "global" "granted" "greatest"
 "handler" "header" "hold" "hour" "identity" "if" "immediate"
 "immutable" "implicit" "including" "increment" "index" "indexes"
 "inherit" "inherits" "inline" "inout" "input" "insensitive" "insert"
-"instead" "invoker" "isolation" "key" "language" "large" "last"
-"lc_collate" "lc_ctype" "least" "level" "listen" "load" "local"
+"instead" "invoker" "isolation" "key" "label" "language" "large" "last"
+"lc_collate" "lc_ctype" "leakproof" "least" "level" "listen" "load" "local"
 "location" "lock" "login" "mapping" "match" "maxvalue" "minute"
-"minvalue" "mode" "month" "move" "name" "names" "national" "nchar"
+"minvalue" "mode" "month" "move" "names" "national" "nchar"
 "next" "no" "nocreatedb" "nocreaterole" "nocreateuser" "noinherit"
-"nologin" "none" "nosuperuser" "nothing" "notify" "nowait" "nullif"
-"nulls" "object" "of" "oids" "operator" "option" "options" "out"
-"overlay" "owned" "owner" "parser" "partial" "partition" "password"
-"plans" "position" "preceding" "prepare" "prepared" "preserve" "prior"
+"nologin" "none"  "noreplication" "nosuperuser" "nothing" "notify" "nowait" "nullif"
+"nulls" "object" "of" "off" "oids" "operator" "option" "options" "out"
+"overlay" "owned" "owner" "parser" "partial" "partition" "passing" "password"
+"plans" "position" "preceding" "precision" "prepare" "prepared" "preserve" "prior"
 "privileges" "procedural" "procedure" "quote" "range" "read"
-"reassign" "recheck" "recursive" "reindex" "relative" "release"
-"rename" "repeatable" "replace" "replica" "reset" "restart" "restrict"
+"reassign" "recheck" "recursive" "ref" "reindex" "relative" "release"
+"rename" "repeatable" "replace" "replica" "replication" "reset" "restart" "restrict"
 "returns" "revoke" "role" "rollback" "row" "rows" "rule" "savepoint"
-"schema" "scroll" "search" "second" "security" "sequence" "sequences"
+"schema" "scroll" "search" "second" "security" "sequence"
 "serializable" "server" "session" "set" "setof" "share" "show"
-"simple" "stable" "standalone" "start" "statement" "statistics"
+"simple" "snapshot" "stable" "standalone" "start" "statement" "statistics"
 "stdin" "stdout" "storage" "strict" "strip" "substring" "superuser"
 "sysid" "system" "tables" "tablespace" "temp" "template" "temporary"
-"transaction" "treat" "trigger" "trim" "truncate" "trusted" "type"
-"unbounded" "uncommitted" "unencrypted" "unknown" "unlisten" "until"
-"update" "vacuum" "valid" "validator" "value" "values" "version"
-"view" "volatile" "whitespace" "work" "wrapper" "write"
-"xmlattributes" "xmlconcat" "xmlelement" "xmlforest" "xmlparse"
-"xmlpi" "xmlroot" "xmlserialize" "year" "yes"
+"transaction" "treat" "trim" "truncate" "trusted" "type" "types"
+"unbounded" "uncommitted" "unencrypted" "unlisten" "unlogged" "until"
+"update" "vacuum" "valid" "validate" "validator" "value" "values" "varying" "version"
+"view" "volatile" "whitespace" "without" "work" "wrapper" "write"
+"xmlattributes" "xmlconcat" "xmlelement" "xmlexists" "xmlforest" "xmlparse"
+"xmlpi" "xmlroot" "xmlserialize" "year" "yes" "zone"
 )
 
      ;; Postgres Reserved
      (sql-font-lock-keywords-builder 'font-lock-keyword-face nil
-"all" "analyse" "analyze" "and" "any" "array" "asc" "as" "asymmetric"
+"all" "analyse" "analyze" "and" "array" "asc" "as" "asymmetric"
 "authorization" "binary" "both" "case" "cast" "check" "collate"
 "column" "concurrently" "constraint" "create" "cross"
 "current_catalog" "current_date" "current_role" "current_schema"
@@ -1983,7 +1983,7 @@ to add functions and PL/SQL keywords.")
 "fetch" "foreign" "for" "freeze" "from" "full" "grant" "group"
 "having" "ilike" "initially" "inner" "in" "intersect" "into" "isnull"
 "is" "join" "leading" "left" "like" "limit" "localtime"
-"localtimestamp" "natural" "notnull" "not" "null" "off" "offset"
+"localtimestamp" "natural" "notnull" "not" "null" "offset"
 "only" "on" "order" "or" "outer" "overlaps" "over" "placing" "primary"
 "references" "returning" "right" "select" "session_user" "similar"
 "some" "symmetric" "table" "then" "to" "trailing" "true" "union"
@@ -1991,15 +1991,21 @@ to add functions and PL/SQL keywords.")
 "with"
 )
 
+     ;; Postgres PL/pgSQL
+     (sql-font-lock-keywords-builder 'font-lock-keyword-face nil
+"assign" "if" "case" "loop" "while" "for" "foreach" "exit" "elsif" "return"
+"raise" "execsql" "dynexecute" "perform" "getdiag" "open" "fetch" "move" "close"
+)
+
      ;; Postgres Data Types
      (sql-font-lock-keywords-builder 'font-lock-type-face nil
 "bigint" "bigserial" "bit" "bool" "boolean" "box" "bytea" "char"
 "character" "cidr" "circle" "date" "decimal" "double" "float4"
 "float8" "inet" "int" "int2" "int4" "int8" "integer" "interval" "line"
-"lseg" "macaddr" "money" "numeric" "path" "point" "polygon"
-"precision" "real" "serial" "serial4" "serial8" "smallint" "text"
+"lseg" "macaddr" "money" "name" "numeric" "path" "point" "polygon"
+"precision" "real" "serial" "serial4" "serial8" "sequences" "smallint" "text"
 "time" "timestamp" "timestamptz" "timetz" "tsquery" "tsvector"
-"txid_snapshot" "uuid" "varbit" "varchar" "varying" "without"
+"txid_snapshot" "unknown" "uuid" "varbit" "varchar" "varying" "without"
 "xml" "zone"
 )))
 
diff --git a/src/ChangeLog b/src/ChangeLog
index a1dc1c2adab..2e7c05e3d36 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (select_frame_for_redisplay): Keep selected_window and
+        selected_frame in sync.
+
 2012-12-14  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (stat_worker): If w32_stat_get_owner_group is zero, do not
@@ -5,8 +10,8 @@
         security APIs.  This is to make most callers of 'stat' and
         'lstat', which don't need that information, much faster.
 
-        * dired.c (Ffile_attributes) [WINDOWSNT]: Set
-        w32_stat_get_owner_group to a non-zero value, to request accurate
+        * dired.c (Ffile_attributes) [WINDOWSNT]:
+        Set w32_stat_get_owner_group to a non-zero value, to request accurate
         owner and group information from 'lstat'.
 
 2012-12-13  Paul Eggert  <eggert@cs.ucla.edu>
@@ -138,8 +143,8 @@
         * emacs.c (main): Call cache_system_info early in startup; we
         previously weren't calling it in Cygwin builds.
 
-        * Makefile.in (ntsource, WINDRES, W32_RES, W#@_RES_LINK): Teach
-        the autoconf build system how to compile a Windows resource file
+        * Makefile.in (ntsource, WINDRES, W32_RES, W#@_RES_LINK):
+        Teach the autoconf build system how to compile a Windows resource file
         and link it to Emacs.
 
 2012-12-10  Dmitry Antipov  <dmantipov@yandex.ru>
@@ -686,8 +691,8 @@
         (set_frame_menubar): Adjust user.
         * w32term.h (struct x_output): Drop outdated #if 0 code.
         (struct w32_output): Use bitfields for explicit_parent,
-        asked_for_visible and menubar_active members.  Drop
-        unused pending_menu_activation member.
+        asked_for_visible and menubar_active members.
+        Drop unused pending_menu_activation member.
         * xterm.h (struct x_output): Drop outdated #if 0 code.
         Use bitfields for explicit_parent, asked_for_visible,
         has_been_visible and net_wm_state_hidden_seen members.
@@ -780,8 +785,8 @@
         * fileio.c (Fsubstitute_in_file_name, Ffile_name_directory)
         (Fexpand_file_name) [DOS_NT]: Pass encoded file name to
         dostounix_filename.  Prevents crashes down the road, because
-        dostounix_filename assumes it gets a unibyte string.  Reported by
-        Michel de Ruiter <michel@sentient.nl>, see
+        dostounix_filename assumes it gets a unibyte string.
+        Reported by Michel de Ruiter <michel@sentient.nl>, see
         http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00017.html
 
 2012-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/src/xdisp.c b/src/xdisp.c
index 552455059de..ca9992bf804 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13020,6 +13020,7 @@ select_frame_for_redisplay (Lisp_Object frame)
   eassert (FRAMEP (frame) && FRAME_LIVE_P (XFRAME (frame)));
 
   selected_frame = frame;
+  selected_window = XFRAME (frame)->selected_window;
 
   do {
     for (tail = XFRAME (frame)->param_alist;
@@ -13040,10 +13041,10 @@ select_frame_for_redisplay (Lisp_Object frame)
    deleted (by an X connection failure during redisplay, for example).  */
 
 static void
-ensure_selected_frame (Lisp_Object old_frame)
+ensure_selected_frame (Lisp_Object frame)
 {
-  if (!EQ (old_frame, selected_frame) && FRAME_LIVE_P (XFRAME (old_frame)))
-    select_frame_for_redisplay (old_frame);
+  if (!EQ (frame, selected_frame) && FRAME_LIVE_P (XFRAME (frame)))
+    select_frame_for_redisplay (frame);
 }
 
 #define STOP_POLLING                                    \