upstream

42 files changed, 549 insertions, 202 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index bc38edfc8d4..17cbcbb3bdf 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,23 @@
+2011-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * unidata/unidata-gen.el (unidata-prop-alist): Update the default
+        values of bidi-class according to DerivedBidiClass.txt from the
+        latest UCD.
+
+2011-08-23  Kenichi Handa  <handa@m17n.org>
+
+        * unidata/unidata-gen.el (unidata-prop-alist): Provide default
+        values for name, general-category, canonical-combining-class,
+        mirrored, and bidi-class.  Describe the meaning of value nil for
+        decimal-digit-value, digit-value, numeric-value, uppercase,
+        lowercase, titlecase, and mirroring.
+        (unidata-gen-table): Handle the case that default-value is a
+        list.  Set default values of characters not listed in a table.
+        (unidata-get-name): Return an empty string if a value in a
+        char-table is nil.
+        (unidata-get-decomposition): Return a list of character itself if
+        a value in a char-table is nil.
+
 2011-08-15  Eli Zaretskii  <eliz@gnu.org>
 
         * unidata/bidimirror.awk: File removed.
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index ab1dcd134ac..1002bb003af 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -146,7 +146,7 @@
     (setq unidata-list (cdr table))))
 
 ;; Alist of this form:
-;;   (PROP INDEX GENERATOR FILENAME DOCSTRING DESCRIBER VAL-LIST)
+;;   (PROP INDEX GENERATOR FILENAME DOCSTRING DESCRIBER DEFAULT VAL-LIST)
 ;; PROP: character property
 ;; INDEX: index to each element of unidata-list for PROP.
 ;;   It may be a function that generates an alist of character codes
@@ -155,14 +155,20 @@
 ;; FILENAME: filename to store the char-table
 ;; DOCSTRING: docstring for the property
 ;; DESCRIBER: function to call to get a description string of property value
-;; DEFAULT: the default value of the property
+;; DEFAULT: the default value of the property.  It may have the form
+;;   (VAL0 (FROM1 TO1 VAL1) ...) which indicates that the default
+;;   value is VAL0 except for characters in the ranges specified by
+;;   FROMn and TOn (incusive).  The default value of characters
+;;   between FROMn and TOn is VALn.
 ;; VAL-LIST: list of specially ordered property values
 
 (defconst unidata-prop-alist
   '((name
      1 unidata-gen-table-name "uni-name.el"
      "Unicode character name.
-Property value is a string.")
+Property value is a string."
+     nil
+     "")
     (general-category
      2 unidata-gen-table-symbol "uni-category.el"
      "Unicode general category.
@@ -170,7 +176,7 @@ Property value is one of the following symbols:
   Lu, Ll, Lt, Lm, Lo, Mn, Mc, Me, Nd, Nl, No, Pc, Pd, Ps, Pe, Pi, Pf, Po,
   Sm, Sc, Sk, So, Zs, Zl, Zp, Cc, Cf, Cs, Co, Cn"
      unidata-describe-general-category
-     nil
+     Cn
      ;; The order of elements must be in sync with unicode_category_t
      ;; in src/character.h.
      (Lu Ll Lt Lm Lo Mn Mc Me Nd Nl No Pc Pd Ps Pe Pi Pf Po
@@ -179,7 +185,8 @@ Property value is one of the following symbols:
      3 unidata-gen-table-integer "uni-combining.el"
      "Unicode canonical combining class.
 Property value is an integer."
-     unidata-describe-canonical-combining-class)
+     unidata-describe-canonical-combining-class
+     0)
     (bidi-class
      4 unidata-gen-table-symbol "uni-bidi.el"
      "Unicode bidi class.
@@ -187,7 +194,12 @@ Property value is one of the following symbols:
   L, LRE, LRO, R, AL, RLE, RLO, PDF, EN, ES, ET,
   AN, CS, NSM, BN, B, S, WS, ON"
      unidata-describe-bidi-class
-     L
+     ;; The assignment of default values to blocks of code points
+     ;; follows the file DerivedBidiClass.txt from the Unicode
+     ;; Character Database (UCD).
+     (L (#x0600 #x06FF AL) (#xFB50 #xFDFF AL) (#xFE70 #xFEFF AL)
+        (#x0590 #x05FF R) (#x07C0 #x08FF R)
+        (#xFB1D #xFB4F R) (#x10800 #x10FFF R) (#x1E800 #x1EFFF R))
      ;; The order of elements must be in sync with bidi_type_t in
      ;; src/dispextern.h.
      (L R EN AN BN B AL LRE LRO RLE RLO PDF ES ET CS NSM S WS ON))
@@ -202,19 +214,24 @@ one of these symbols representing compatibility formatting tag:
     (decimal-digit-value
      6 unidata-gen-table-integer "uni-decimal.el"
      "Unicode numeric value (decimal digit).
-Property value is an integer.")
+Property value is an integer 0..9, or nil.
+The value nil stands for NaN \"Numeric_Value\".")
     (digit-value
      7 unidata-gen-table-integer "uni-digit.el"
      "Unicode numeric value (digit).
-Property value is an integer.")
+Property value is an integer 0..9, or nil.
+The value nil stands for NaN \"Numeric_Value\".")
     (numeric-value
      8 unidata-gen-table-numeric "uni-numeric.el"
      "Unicode numeric value (numeric).
-Property value is an integer or a floating point.")
+Property value is an integer, a floating point, or nil.
+The value nil stands for NaN \"Numeric_Value\".")
     (mirrored
      9 unidata-gen-table-symbol "uni-mirrored.el"
      "Unicode bidi mirrored flag.
-Property value is a symbol `Y' or `N'.  See also the property `mirroring'.")
+Property value is a symbol `Y' or `N'.  See also the property `mirroring'."
+     nil
+     N)
     (old-name
      10 unidata-gen-table-name "uni-old-name.el"
      "Unicode old names as published in Unicode 1.0.
@@ -226,23 +243,30 @@ Property value is a string.")
     (uppercase
      12 unidata-gen-table-character "uni-uppercase.el"
      "Unicode simple uppercase mapping.
-Property value is a character."
+Property value is a character or nil.
+The value nil means that the actual property value of a character
+is the character itself."
      string)
     (lowercase
      13 unidata-gen-table-character "uni-lowercase.el"
      "Unicode simple lowercase mapping.
-Property value is a character."
+Property value is a character or nil.
+The value nil means that the actual property value of a character
+is the character itself."
      string)
     (titlecase
      14 unidata-gen-table-character "uni-titlecase.el"
      "Unicode simple titlecase mapping.
-Property value is a character."
+Property value is a character or nil.
+The value nil means that the actual property value of a character
+is the character itself."
      string)
     (mirroring
      unidata-gen-mirroring-list unidata-gen-table-character "uni-mirrored.el"
      "Unicode bidi-mirroring characters.
-Property value is a character that has the corresponding mirroring image,
-or nil for non-mirrored character.")))
+Property value is a character that has the corresponding mirroring image or nil.
+The value nil means that the actual property value of a character
+is the character itself.")))
 
 ;; Functions to access the above data.
 (defsubst unidata-prop-index (prop) (nth 1 (assq prop unidata-prop-alist)))
@@ -393,9 +417,18 @@ or nil for non-mirrored character.")))
     (while tail
       (setcar tail (cons (car tail) val-code))
       (setq tail (cdr tail) val-code (1+ val-code)))
-    (setq default-value (unidata-encode-val val-list default-value))
-    (set-char-table-range table t default-value)
-    (set-char-table-range table nil default-value)
+    (if (consp default-value)
+        (setq default-value (copy-sequence default-value))
+      (setq default-value (list default-value)))
+    (setcar default-value
+            (unidata-encode-val val-list (car default-value)))
+    (set-char-table-range table t (car default-value))
+    (set-char-table-range table nil (car default-value))
+    (dolist (elm (cdr default-value))
+      (setcar (nthcdr 2 elm)
+              (unidata-encode-val val-list (nth 2 elm)))
+      (set-char-table-range table (cons (car elm) (nth 1 elm)) (nth 2 elm)))
+
     (setq tail unidata-list)
     (while tail
       (setq elt (car tail) tail (cdr tail))
@@ -419,17 +452,27 @@ or nil for non-mirrored character.")))
                 (setq prev-range-data (cons (cons from to) val-code)))))
         (let* ((start (lsh (lsh range -7) 7))
                (limit (+ start 127))
-               str count new-val)
-          (fillarray vec 0)
-          ;; See the comment above.
-          (when (and prev-range-data
-                     (>= (cdr (car prev-range-data)) start))
-            (let ((from (car (car prev-range-data)))
-                  (to (cdr (car prev-range-data)))
-                  (vcode (cdr prev-range-data)))
+               str count new-val from to vcode)
+          (fillarray vec (car default-value))
+          (dolist (elm (cdr default-value))
+            (setq from (car elm) to (nth 1 elm))
+            (when (and (<= from limit)
+                       (or (>= from start) (>= to start)))
+              (setq from (max from start)
+                    to (min to limit)
+                    vcode (nth 2 elm))
               (while (<= from to)
                 (aset vec (- from start) vcode)
                 (setq from (1+ from)))))
+          ;; See the comment above.
+          (when (and prev-range-data
+                     (>= (cdr (car prev-range-data)) start))
+            (setq from (car (car prev-range-data))
+                  to (cdr (car prev-range-data))
+                  vcode (cdr prev-range-data))
+            (while (<= from to)
+              (aset vec (- from start) vcode)
+              (setq from (1+ from))))
           (setq prev-range-data nil)
           (if val-code
               (aset vec (- range start) val-code))
@@ -669,7 +712,7 @@ or nil for non-mirrored character.")))
             (aset table c name)
             (if (= c char)
                 (setq val name))))
-        val)))
+        (or val ""))))
 
    ((and (integerp val) (> val 0))
     (let* ((symbol-table (aref (char-table-extra-slot table 4) 1))
@@ -695,7 +738,9 @@ or nil for non-mirrored character.")))
             ((eq sym 'CJK\ COMPATIBILITY\ IDEOGRAPH)
              (format "%s-%04X" sym char))
             ((eq sym 'VARIATION\ SELECTOR)
-             (format "%s-%d" sym (+ (- char #xe0100) 17))))))))
+             (format "%s-%d" sym (+ (- char #xe0100) 17))))))
+
+   (t "")))
 
 ;; Store VAL as the name of CHAR in TABLE.
 
@@ -707,6 +752,9 @@ or nil for non-mirrored character.")))
 
 (defun unidata-get-decomposition (char val table)
   (cond
+   ((not val)
+    (list char))
+
    ((consp val)
     val)
 
@@ -747,7 +795,8 @@ or nil for non-mirrored character.")))
             (aset vec idx (nconc word-list tail-list)))
         (dotimes (i 128)
           (aset table (+ first-char i) (aref vec i)))
-        (aref vec (- char first-char)))))
+        (setq val (aref vec (- char first-char)))
+        (or val (list char)))))
 
    ;; Hangul syllable
    ((and (eq val 0) (>= char #xAC00) (<= char #xD7A3))
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4cb4d0a6f50..4bf615328b1 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * display.texi (Bidirectional Display): Document return value in
+        buffers that are not bidi-reordered for display, and in unibyte
+        buffers.
+
+2011-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * nonascii.texi (Character Properties): Document the values for
+        unassigned codepoints.
+
 2011-08-18  Eli Zaretskii  <eliz@gnu.org>
 
         * nonascii.texi (Character Properties): Document use of
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 8f7f4003411..0593eba8f05 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -6104,7 +6104,9 @@ omitted or @code{nil}, it defaults to the current buffer.  If the
 buffer-local value of the variable @code{bidi-paragraph-direction} is
 non-@code{nil}, the returned value will be identical to that value;
 otherwise, the returned value reflects the paragraph direction
-determined dynamically by Emacs.
+determined dynamically by Emacs.  For buffers whose value of
+@code{bidi-display-reordering} is @code{nil} as well as unibyte
+buffers, this function always returns @code{left-to-right}.
 @end defun
 
 @cindex layout on display, and bidirectional text
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 7b6d665b2ac..298c7c3d1a8 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -369,6 +369,12 @@ replacing each @samp{_} character with a dash @samp{-}.  For example,
 @code{canonical-combining-class}.  However, sometimes we shorten the
 names to make their use easier.
 
+@cindex unassigned character codepoints
+  Some codepoints are left @dfn{unassigned} by the
+@acronym{UCD}---they don't correspond to any character.  The Unicode
+Standard defines default values of properties for such codepoints;
+they are mentioned below for each property.
+
   Here is the full list of value types for all the character
 properties that Emacs knows about:
 
@@ -376,24 +382,31 @@ properties that Emacs knows about:
 @item name
 Corresponds to the @code{Name} Unicode property.  The value is a
 string consisting of upper-case Latin letters A to Z, digits, spaces,
-and hyphen @samp{-} characters.
+and hyphen @samp{-} characters.  For unassigned codepoints, the value
+is an empty string.
 
 @cindex unicode general category
 @item general-category
 Corresponds to the @code{General_Category} Unicode property.  The
 value is a symbol whose name is a 2-letter abbreviation of the
-character's classification.
+character's classification.  For unassigned codepoints, the value
+is @code{Cn}.
 
 @item canonical-combining-class
 Corresponds to the @code{Canonical_Combining_Class} Unicode property.
-The value is an integer number.
+The value is an integer number.  For unassigned codepoints, the value
+is zero.
 
 @cindex bidirectional class of characters
 @item bidi-class
 Corresponds to the Unicode @code{Bidi_Class} property.  The value is a
 symbol whose name is the Unicode @dfn{directional type} of the
 character.  Emacs uses this property when it reorders bidirectional
-text for display (@pxref{Bidirectional Display}).
+text for display (@pxref{Bidirectional Display}).  For unassigned
+codepoints, the value depends on the code blocks to which the
+codepoint belongs: most unassigned codepoints get the value of
+@code{L} (strong L), but some get values of @code{AL} (Arabic letter)
+or @code{R} (strong R).
 
 @item decomposition
 Corresponds to the Unicode @code{Decomposition_Type} and
@@ -405,19 +418,22 @@ Note that the Unicode spec writes these tag names inside
 brackets; e.g., Unicode specifies @samp{<small>} where Emacs uses
 @samp{small}.
 }; the other elements are characters that give the compatibility
-decomposition sequence of this character.
+decomposition sequence of this character.  For unassigned codepoints,
+the value is the character itself.
 
 @item decimal-digit-value
 Corresponds to the Unicode @code{Numeric_Value} property for
 characters whose @code{Numeric_Type} is @samp{Digit}.  The value is an
-integer number.
+integer number.  For unassigned codepoints, the value is @code{nil},
+which means @acronym{NaN}, or ``not-a-number''.
 
 @item digit-value
 Corresponds to the Unicode @code{Numeric_Value} property for
 characters whose @code{Numeric_Type} is @samp{Decimal}.  The value is
 an integer number.  Examples of such characters include compatibility
 subscript and superscript digits, for which the value is the
-corresponding number.
+corresponding number.  For unassigned codepoints, the value is
+@code{nil}, which means @acronym{NaN}.
 
 @item numeric-value
 Corresponds to the Unicode @code{Numeric_Value} property for
@@ -426,12 +442,15 @@ this property is an integer or a floating-point number.  Examples of
 characters that have this property include fractions, subscripts,
 superscripts, Roman numerals, currency numerators, and encircled
 numbers.  For example, the value of this property for the character
-@code{U+2155} (@sc{vulgar fraction one fifth}) is @code{0.2}.
+@code{U+2155} (@sc{vulgar fraction one fifth}) is @code{0.2}.  For
+unassigned codepoints, the value is @code{nil}, which means
+@acronym{NaN}.
 
 @cindex mirroring of characters
 @item mirrored
 Corresponds to the Unicode @code{Bidi_Mirrored} property.  The value
-of this property is a symbol, either @code{Y} or @code{N}.
+of this property is a symbol, either @code{Y} or @code{N}.  For
+unassigned codepoints, the value is @code{N}.
 
 @item mirroring
 Corresponds to the Unicode @code{Bidi_Mirroring_Glyph} property.  The
@@ -443,29 +462,33 @@ property; however, some characters whose @code{mirrored} property is
 @code{Y} also have @code{nil} for @code{mirroring}, because no
 appropriate characters exist with mirrored glyphs.  Emacs uses this
 property to display mirror images of characters when appropriate
-(@pxref{Bidirectional Display}).
+(@pxref{Bidirectional Display}).  For unassigned codepoints, the value
+is @code{nil}.
 
 @item old-name
 Corresponds to the Unicode @code{Unicode_1_Name} property.  The value
-is a string.
+is a string.  For unassigned codepoints, the value is an empty string.
 
 @item iso-10646-comment
 Corresponds to the Unicode @code{ISO_Comment} property.  The value is
-a string.
+a string.  For unassigned codepoints, the value is an empty string.
 
 @item uppercase
 Corresponds to the Unicode @code{Simple_Uppercase_Mapping} property.
-The value of this property is a single character.
+The value of this property is a single character.  For unassigned
+codepoints, the value is @code{nil}, which means the character itself.
 
 @item lowercase
 Corresponds to the Unicode @code{Simple_Lowercase_Mapping} property.
-The value of this property is a single character.
+The value of this property is a single character.  For unassigned
+codepoints, the value is @code{nil}, which means the character itself.
 
 @item titlecase
 Corresponds to the Unicode @code{Simple_Titlecase_Mapping} property.
 @dfn{Title case} is a special form of a character used when the first
 character of a word needs to be capitalized.  The value of this
-property is a single character.
+property is a single character.  For unassigned codepoints, the value
+is @code{nil}, which means the character itself.
 @end table
 
 @defun get-char-code-property char propname
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 31752a2bc2a..092aa6fb387 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-24  Steve Chapel  <schapel@laptop.stevechapel.com>  (tiny change)
+
+        * refcards/refcard.tex: Add a few more commands. (Bug#9343)
+
 2011-08-22  Juri Linkov  <juri@jurta.org>
 
         * compilation.txt: Add more samples of output and non-output
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 52b9348db26..7d4f9dbfa89 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -332,6 +332,7 @@ If Emacs is still searching, \kbd{C-g} cancels only the part not matched.
 
 \shortcopyrightnotice
 
+\newcolumn
 \section{Motion}
 
 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
@@ -352,7 +353,10 @@ If Emacs is still searching, \kbd{C-g} cancels only the part not matched.
 \key{scroll to previous screen}{M-v}
 \key{scroll left}{C-x <}
 \key{scroll right}{C-x >}
-\key{scroll current line to center of screen}{C-u C-l}
+\key{scroll current line to center, top, bottom}{C-l}
+
+\key{goto line}{M-g g}
+\key{back to indentation}{M-m}
 
 \section{Killing and Deleting}
 
@@ -393,14 +397,15 @@ If Emacs is still searching, \kbd{C-g} cancels only the part not matched.
 
 Valid responses in query-replace mode are
 
-\key{{\bf replace} this one, go on to next}{SPC}
+\key{{\bf replace} this one, go on to next}{SPC {\rm or} y}
 \key{replace this one, don't move}{,}
-\key{{\bf skip} to next without replacing}{DEL}
+\key{{\bf skip} to next without replacing}{DEL {\rm or} n}
 \key{replace all remaining matches}{!}
 \key{{\bf back up} to the previous match}{^}
 \key{{\bf exit} query-replace}{RET}
 \key{enter recursive edit (\kbd{C-M-c} to exit)}{C-r}
 
+\newcolumn
 \section{Multiple Windows}
 
 When two commands are shown, the second is a similar command for a
@@ -438,6 +443,7 @@ frame instead of a window.
 \key{indent {\bf region} (mode-dependent)}{C-M-\\}
 \key{indent {\bf sexp} (mode-dependent)}{C-M-q}
 \key{indent region rigidly {\it arg\/} columns}{C-x TAB}
+\key{indent for comment}{M-;}
 
 \key{insert newline after point}{C-o}
 \key{move rest of line vertically down}{C-M-o}
@@ -536,6 +542,13 @@ minibuffer.  Type \kbd{F10} to activate menu bar items on text terminals.
 
 \key{expand previous word dynamically}{M-/}
 
+\section{Miscellaneous}
+
+\key{numeric argument}{C-u {\it num}}
+\key{negative argument}{M--}
+\key{quoted insert}{C-q {\it char}}
+
+\newcolumn
 \section{Regular Expressions}
 
 \key{any single character except a newline}{. {\rm(dot)}}
@@ -604,6 +617,7 @@ Other:
 
 \endindentedkeys
 
+\newcolumn
 \section{Registers}
 
 \key{save region in register}{C-x r s}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2973fa64360..91078ce3246 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,91 @@
+2011-08-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (bury-buffer, quit-window): Use bury-buffer-internal.
+
+2011-08-25  Glenn Morris  <rgm@gnu.org>
+
+        * mail/smtpmail.el (smtpmail-smtp-user): Add version: tag.
+        (smtpmail-via-smtp): Handle nil response from smtp.
+
+2011-08-24  Juri Linkov  <juri@jurta.org>
+
+        * proced.el (proced-marked): Inherit from `error' instead of
+        `font-lock-warning-face'.
+
+        * ibuffer.el (ibuffer-marked-face): Change default face from
+        `font-lock-warning-face' to `warning'.
+        (ibuffer-deletion-face): Change default face from
+        `font-lock-type-face' to `error'.
+
+        * battery.el (battery-update): Use the face `error' instead of
+        `font-lock-warning-face' (bug#6117).
+
+2011-08-24  Juri Linkov  <juri@jurta.org>
+
+        * faces.el (success): Change face color from "Green3" to
+        "ForestGreen" on light background (bug#9353).
+
+2011-08-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (quit-window): Renamed from quit-restore-window.  Use
+        same arglist as old quit-window.
+        (frame-auto-delete): Doc fix.
+
+        * view.el (view-mode-exit): Use quit-window.
+
+2011-08-24  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-ring-adjust1): Start visiting previous
+        search strings from the index 0 (-1 + 1) instead of 1 (0 + 1).
+        (isearch-repeat, isearch-edit-string): Call `isearch-ring-adjust1'
+        for empty search string (when the last search string is reused
+        automatically) to adjust the isearch ring to the last element and
+        prepare the correct index for further M-p commands (bug#9185).
+
+2011-08-24  Kenichi Handa  <handa@m17n.org>
+
+        * international/ucs-normalize.el: If decomposition property of
+        CHAR is the default one (i.e. a list of CHAR itself), treat it as
+        nil.
+        (nfd, nfkd): Likewise.
+
+2011-08-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mpc.el (mpc--proc-filter): Don't signal mpc-proc-error since signals
+        from process filters aren't reliably transmitted to the surrounding
+        accept-process-output.
+        (mpc-proc-check): New function.
+        (mpc-proc-sync): Use it (bug#8293)
+
+2011-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/eieio.el (eieio-defmethod, eieio-defgeneric):
+        Add compatibility functions (bug#9313).
+
+2011-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * cus-start.el (all): Add entry for bidi-paragraph-direction.
+
+        * international/uni-bidi.el: Regenerated.
+
+2011-08-23  Kenichi Handa  <handa@m17n.org>
+
+        * international/charprop.el:
+        * international/uni-bidi.el:
+        * international/uni-category.el:
+        * international/uni-combining.el:
+        * international/uni-comment.el:
+        * international/uni-decimal.el:
+        * international/uni-decomposition.el:
+        * international/uni-digit.el:
+        * international/uni-lowercase.el:
+        * international/uni-mirrored.el:
+        * international/uni-name.el:
+        * international/uni-numeric.el:
+        * international/uni-old-name.el:
+        * international/uni-titlecase.el:
+        * international/uni-uppercase.el: Regenerate.
+
 2011-08-23  Martin Rudalics  <rudalics@gmx.at>
 
         * help.el (help-window-setup): Fix message displayed when other
diff --git a/lisp/battery.el b/lisp/battery.el
index d7d3045fa58..e0bba96b655 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -199,7 +199,7 @@ seconds."
                       'face
                       (and (<= (car (read-from-string (cdr (assq ?p data))))
                                    battery-load-critical)
-                           'font-lock-warning-face)
+                           'error)
                       'help-echo "Battery status information")))
   (force-mode-line-update))
 
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 389716b35b9..232c6c3808e 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -118,6 +118,13 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                   :standard (not noninteractive)
                                   :initialize custom-initialize-delay
                                   :set custom-set-minor-mode)
+             (bidi-paragraph-direction
+              paragraphs
+              (choice
+               (const :tag "Left to Right" left-to-right)
+               (const :tag "Right to Left" right-to-left)
+               (const :tag "Dynamic, according to paragraph text" nil))
+              "24.1")
              ;; callint.c
              (mark-even-if-inactive editing-basics boolean)
              ;; callproc.c
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 83c09b6fe0f..f1fe9594fc0 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -1312,20 +1312,20 @@ Summary:
 (defun eieio--defmethod (method kind argclass code)
   "Work part of the `defmethod' macro defining METHOD with ARGS."
   (let ((key
-    ;; find optional keys
+         ;; find optional keys
          (cond ((or (eq ':BEFORE kind)
                     (eq ':before kind))
-                 method-before)
+                method-before)
                ((or (eq ':AFTER kind)
                     (eq ':after kind))
-                 method-after)
+                method-after)
                ((or (eq ':PRIMARY kind)
                     (eq ':primary kind))
-                 method-primary)
+                method-primary)
                ((or (eq ':STATIC kind)
                     (eq ':static kind))
-                 method-static)
-                ;; Primary key
+                method-static)
+               ;; Primary key
                (t method-primary))))
     ;; Make sure there is a generic (when called from defclass).
     (eieio--defalias
@@ -1338,8 +1338,8 @@ Summary:
     ;; under the type `primary' which is a non-specific calling of the
     ;; function.
     (if argclass
-          (if (not (class-p argclass))
-              (error "Unknown class type %s in method parameters"
+        (if (not (class-p argclass))
+            (error "Unknown class type %s in method parameters"
                    argclass))
       (if (= key -1)
           (signal 'wrong-type-argument (list :static 'non-class-arg)))
@@ -2864,6 +2864,106 @@ of `eq'."
 )
 
 
+;;; Obsolete backward compatibility functions.
+;; Needed to run byte-code compiled with the EIEIO of Emacs-23.
+
+(defun eieio-defmethod (method args)
+  "Obsolete work part of an old version of the `defmethod' macro."
+  (let ((key nil) (body nil) (firstarg nil) (argfix nil) (argclass nil) loopa)
+    ;; find optional keys
+    (setq key
+          (cond ((or (eq ':BEFORE (car args))
+                     (eq ':before (car args)))
+                 (setq args (cdr args))
+                 method-before)
+                ((or (eq ':AFTER (car args))
+                     (eq ':after (car args)))
+                 (setq args (cdr args))
+                 method-after)
+                ((or (eq ':PRIMARY (car args))
+                     (eq ':primary (car args)))
+                 (setq args (cdr args))
+                 method-primary)
+                ((or (eq ':STATIC (car args))
+                     (eq ':static (car args)))
+                 (setq args (cdr args))
+                 method-static)
+                ;; Primary key
+                (t method-primary)))
+    ;; get body, and fix contents of args to be the arguments of the fn.
+    (setq body (cdr args)
+          args (car args))
+    (setq loopa args)
+    ;; Create a fixed version of the arguments
+    (while loopa
+      (setq argfix (cons (if (listp (car loopa)) (car (car loopa)) (car loopa))
+                         argfix))
+      (setq loopa (cdr loopa)))
+    ;; make sure there is a generic
+    (eieio-defgeneric
+     method
+     (if (stringp (car body))
+         (car body) (format "Generically created method `%s'." method)))
+    ;; create symbol for property to bind to.  If the first arg is of
+    ;; the form (varname vartype) and `vartype' is a class, then
+    ;; that class will be the type symbol.  If not, then it will fall
+    ;; under the type `primary' which is a non-specific calling of the
+    ;; function.
+    (setq firstarg (car args))
+    (if (listp firstarg)
+        (progn
+          (setq argclass  (nth 1 firstarg))
+          (if (not (class-p argclass))
+              (error "Unknown class type %s in method parameters"
+                     (nth 1 firstarg))))
+      (if (= key -1)
+          (signal 'wrong-type-argument (list :static 'non-class-arg)))
+      ;; generics are higher
+      (setq key (eieio-specialized-key-to-generic-key key)))
+    ;; Put this lambda into the symbol so we can find it
+    (if (byte-code-function-p (car-safe body))
+        (eieiomt-add method (car-safe body) key argclass)
+      (eieiomt-add method (append (list 'lambda (reverse argfix)) body)
+                   key argclass))
+    )
+
+  (when eieio-optimize-primary-methods-flag
+    ;; Optimizing step:
+    ;;
+    ;; If this method, after this setup, only has primary methods, then
+    ;; we can setup the generic that way.
+    (if (generic-primary-only-p method)
+        ;; If there is only one primary method, then we can go one more
+        ;; optimization step.
+        (if (generic-primary-only-one-p method)
+            (eieio-defgeneric-reset-generic-form-primary-only-one method)
+          (eieio-defgeneric-reset-generic-form-primary-only method))
+      (eieio-defgeneric-reset-generic-form method)))
+
+  method)
+(make-obsolete 'eieio-defmethod 'eieio--defmethod "24.1")
+
+(defun eieio-defgeneric (method doc-string)
+  "Obsolete work part of an old version of the `defgeneric' macro."
+  (if (and (fboundp method) (not (generic-p method))
+           (or (byte-code-function-p (symbol-function method))
+               (not (eq 'autoload (car (symbol-function method)))))
+           )
+      (error "You cannot create a generic/method over an existing symbol: %s"
+             method))
+  ;; Don't do this over and over.
+  (unless (fboundp 'method)
+    ;; This defun tells emacs where the first definition of this
+    ;; method is defined.
+    `(defun ,method nil)
+    ;; Make sure the method tables are installed.
+    (eieiomt-install method)
+    ;; Apply the actual body of this function.
+    (fset method (eieio-defgeneric-form method doc-string))
+    ;; Return the method
+    'method))
+(make-obsolete 'eieio-defgeneric nil "24.1")
+
 ;;; Interfacing with edebug
 ;;
 (defun eieio-edebug-prin1-to-string (object &optional noescape)
diff --git a/lisp/faces.el b/lisp/faces.el
index 404bd7b6609..3c4a3330c81 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2435,7 +2435,7 @@ It is used for characters of no fonts too."
 
 (defface success
   '((((class color) (min-colors 16) (background light))
-     (:foreground "Green3" :weight bold))
+     (:foreground "ForestGreen" :weight bold))
     (((class color) (min-colors 88) (background dark))
      (:foreground "Green1" :weight bold))
     (((class color) (min-colors 16) (background dark))
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 725192399ff..5a86508e144 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -356,12 +356,12 @@ directory, like `default-directory'."
   :type 'hook
   :group 'ibuffer)
 
-(defcustom ibuffer-marked-face 'font-lock-warning-face
+(defcustom ibuffer-marked-face 'warning
   "Face used for displaying marked buffers."
   :type 'face
   :group 'ibuffer)
 
-(defcustom ibuffer-deletion-face 'font-lock-type-face
+(defcustom ibuffer-deletion-face 'error
   "Face used for displaying buffers marked for deletion."
   :type 'face
   :group 'ibuffer)
diff --git a/lisp/international/charprop.el b/lisp/international/charprop.el
index 919666010b1..2424e87ae44 100644
--- a/lisp/international/charprop.el
+++ b/lisp/international/charprop.el
@@ -29,15 +29,18 @@ one of these symbols representing compatibility formatting tag:
 ;; FILE: uni-decimal.el
 (define-char-code-property 'decimal-digit-value "uni-decimal.el"
   "Unicode numeric value (decimal digit).
-Property value is an integer.")
+Property value is an integer 0..9, or nil.
+The value nil stands for NaN \"Numeric_Value\".")
 ;; FILE: uni-digit.el
 (define-char-code-property 'digit-value "uni-digit.el"
   "Unicode numeric value (digit).
-Property value is an integer.")
+Property value is an integer 0..9, or nil.
+The value nil stands for NaN \"Numeric_Value\".")
 ;; FILE: uni-numeric.el
 (define-char-code-property 'numeric-value "uni-numeric.el"
   "Unicode numeric value (numeric).
-Property value is an integer or a floating point.")
+Property value is an integer, a floating point, or nil.
+The value nil stands for NaN \"Numeric_Value\".")
 ;; FILE: uni-mirrored.el
 (define-char-code-property 'mirrored "uni-mirrored.el"
   "Unicode bidi mirrored flag.
@@ -53,20 +56,27 @@ Property value is a string.")
 ;; FILE: uni-uppercase.el
 (define-char-code-property 'uppercase "uni-uppercase.el"
   "Unicode simple uppercase mapping.
-Property value is a character.")
+Property value is a character or nil.
+The value nil means that the actual property value of a character
+is the character itself.")
 ;; FILE: uni-lowercase.el
 (define-char-code-property 'lowercase "uni-lowercase.el"
   "Unicode simple lowercase mapping.
-Property value is a character.")
+Property value is a character or nil.
+The value nil means that the actual property value of a character
+is the character itself.")
 ;; FILE: uni-titlecase.el
 (define-char-code-property 'titlecase "uni-titlecase.el"
   "Unicode simple titlecase mapping.
-Property value is a character.")
+Property value is a character or nil.
+The value nil means that the actual property value of a character
+is the character itself.")
 ;; FILE: uni-mirrored.el
 (define-char-code-property 'mirroring "uni-mirrored.el"
   "Unicode bidi-mirroring characters.
-Property value is a character that has the corresponding mirroring image,
-or nil for non-mirrored character.")
+Property value is a character that has the corresponding mirroring image or nil.
+The value nil means that the actual property value of a character
+is the character itself.")
 ;; Local Variables:
 ;; coding: utf-8
 ;; no-byte-compile: t
diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el
index f83e0f7588f..df05b355b46 100644
--- a/lisp/international/ucs-normalize.el
+++ b/lisp/international/ucs-normalize.el
@@ -139,14 +139,17 @@
   (defun nfd (char)
     (let ((decomposition
            (get-char-code-property char 'decomposition)))
-      (if (and decomposition (numberp (car decomposition)))
+      (if (and decomposition (numberp (car decomposition))
+               (or (> (length decomposition) 1)
+                   (/= (car decomposition) char)))
           decomposition)))
 
   (defun nfkd (char)
     (let ((decomposition
            (get-char-code-property char 'decomposition)))
       (if (symbolp (car decomposition)) (cdr decomposition)
-        decomposition)))
+        (if (or (> (length decomposition) 1)
+                (/= (car decomposition) char)) decomposition))))
 
   (defun hfs-nfd (char)
     (when (or (and (>= char 0) (< char #x2000))
@@ -180,6 +183,9 @@
          (setq ccc (ucs-normalize-ccc char))
          (setq decomposition (get-char-code-property
                               char 'decomposition))
+         (if (and (= (length decomposition) 1)
+                  (= (car decomposition) char))
+             (setq decomposition nil))
          (if (and ccc (/= 0 ccc)) (add-to-list 'combining-chars char))
          (if (and (numberp (car decomposition))
                   (/= (ucs-normalize-ccc (car decomposition))
diff --git a/lisp/international/uni-bidi.el b/lisp/international/uni-bidi.el
index e7682c6d8ff..4d86fc821fa 100644
--- a/lisp/international/uni-bidi.el
+++ b/lisp/international/uni-bidi.el
diff --git a/lisp/international/uni-category.el b/lisp/international/uni-category.el
index a4455decc52..94b7c18b6e2 100644
--- a/lisp/international/uni-category.el
+++ b/lisp/international/uni-category.el
diff --git a/lisp/international/uni-combining.el b/lisp/international/uni-combining.el
index 227b9d0af79..1437ff9acbd 100644
--- a/lisp/international/uni-combining.el
+++ b/lisp/international/uni-combining.el
diff --git a/lisp/international/uni-comment.el b/lisp/international/uni-comment.el
index c9743064bd4..21ccfe3ffe7 100644
--- a/lisp/international/uni-comment.el
+++ b/lisp/international/uni-comment.el
diff --git a/lisp/international/uni-decimal.el b/lisp/international/uni-decimal.el
index 2c424ffb5de..096257add20 100644
--- a/lisp/international/uni-decimal.el
+++ b/lisp/international/uni-decimal.el
diff --git a/lisp/international/uni-decomposition.el b/lisp/international/uni-decomposition.el
index b0bf07bbe85..b9660cdab0a 100644
--- a/lisp/international/uni-decomposition.el
+++ b/lisp/international/uni-decomposition.el
diff --git a/lisp/international/uni-digit.el b/lisp/international/uni-digit.el
index fc52fd8c28c..efb78b0e43d 100644
--- a/lisp/international/uni-digit.el
+++ b/lisp/international/uni-digit.el
diff --git a/lisp/international/uni-lowercase.el b/lisp/international/uni-lowercase.el
index 41890018204..7afd9503cb3 100644
--- a/lisp/international/uni-lowercase.el
+++ b/lisp/international/uni-lowercase.el
diff --git a/lisp/international/uni-mirrored.el b/lisp/international/uni-mirrored.el
index 006cf575591..e650166c24c 100644
--- a/lisp/international/uni-mirrored.el
+++ b/lisp/international/uni-mirrored.el
diff --git a/lisp/international/uni-name.el b/lisp/international/uni-name.el
index 7fac18b278d..8b681631067 100644
--- a/lisp/international/uni-name.el
+++ b/lisp/international/uni-name.el
diff --git a/lisp/international/uni-numeric.el b/lisp/international/uni-numeric.el
index d16e8c00870..a1865f1fb23 100644
--- a/lisp/international/uni-numeric.el
+++ b/lisp/international/uni-numeric.el
diff --git a/lisp/international/uni-old-name.el b/lisp/international/uni-old-name.el
index 4e704e5cdd0..de2d67b9450 100644
--- a/lisp/international/uni-old-name.el
+++ b/lisp/international/uni-old-name.el
diff --git a/lisp/international/uni-titlecase.el b/lisp/international/uni-titlecase.el
index b8098c81876..517edb20445 100644
--- a/lisp/international/uni-titlecase.el
+++ b/lisp/international/uni-titlecase.el
diff --git a/lisp/international/uni-uppercase.el b/lisp/international/uni-uppercase.el
index 899276eb725..fcb22d72470 100644
--- a/lisp/international/uni-uppercase.el
+++ b/lisp/international/uni-uppercase.el
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 1942641fae9..7fcc31f188f 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1191,19 +1191,17 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
                   isearch-word isearch-new-word))
 
           ;; Empty isearch-string means use default.
-          (if (= 0 (length isearch-string))
-              (setq isearch-string (or (car (if isearch-regexp
-                                                regexp-search-ring
-                                              search-ring))
-                                       "")
-
-                    isearch-message
-                    (mapconcat 'isearch-text-char-description
-                               isearch-string ""))
-            ;; This used to set the last search string,
-            ;; but I think it is not right to do that here.
-            ;; Only the string actually used should be saved.
-            ))
+          (when (= 0 (length isearch-string))
+            (setq isearch-string (or (car (if isearch-regexp
+                                              regexp-search-ring
+                                            search-ring))
+                                     "")
+
+                  isearch-message
+                  (mapconcat 'isearch-text-char-description
+                             isearch-string ""))
+            ;; After taking the last element, adjust ring to previous one.
+            (isearch-ring-adjust1 nil)))
 
         ;; This used to push the state as of before this C-s, but it adds
         ;; an inconsistent state where part of variables are from the
@@ -1290,7 +1288,9 @@ Use `isearch-exit' to quit without signaling."
                   isearch-message
                   (mapconcat 'isearch-text-char-description
                              isearch-string "")
-                  isearch-case-fold-search isearch-last-case-fold-search))
+                  isearch-case-fold-search isearch-last-case-fold-search)
+            ;; After taking the last element, adjust ring to previous one.
+            (isearch-ring-adjust1 nil))
         ;; If already have what to search for, repeat it.
         (or isearch-success
             (progn
@@ -2071,7 +2071,7 @@ Isearch mode."
         ()
       (set yank-pointer-name
            (setq yank-pointer
-                 (mod (+ (or yank-pointer 0)
+                 (mod (+ (or yank-pointer (if advance 0 -1))
                          (if advance -1 1))
                       length)))
       (setq isearch-string (nth yank-pointer ring)
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 40fbb072594..69c49c471c0 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -88,6 +88,7 @@ The default value would be \"smtp\" or 25."
 
 (defcustom smtpmail-smtp-user nil
   "User name to use when looking up credentials."
+  :version "24.1"
   :type '(choice (const nil) string)
   :group 'smtpmail)
 
@@ -677,7 +678,7 @@ The list is in preference order.")
               (throw 'done (format "No greeting: %s" greeting)))
             (when (>= code 400)
               (throw 'done (format "Connection not allowed: %s" greeting))))
-          
+
           (with-current-buffer process-buffer
             (set-buffer-process-coding-system 'raw-text-unix 'raw-text-unix)
             (make-local-variable 'smtpmail-read-point)
@@ -730,7 +731,7 @@ The list is in preference order.")
 
             (when (member 'xusr supported-extensions)
               (smtpmail-command-or-throw process (format "XUSR")))
-            
+
             ;; MAIL FROM:<sender>
             (let ((size-part
                    (if (or (member 'size supported-extensions)
@@ -769,7 +770,7 @@ The list is in preference order.")
                 )
                ((and auth-mechanisms
                      (not ask-for-password)
-                     (= (car result) 530))
+                     (eq (car result) 530))
                 ;; We got a "530 auth required", so we close and try
                 ;; again, this time asking the user for a password.
                 (smtpmail-send-command process "QUIT")
@@ -796,6 +797,7 @@ The list is in preference order.")
                   nil)
                  ((and auth-mechanisms
                        (not ask-for-password)
+                       (integerp (car result))
                        (>= (car result) 550)
                        (<= (car result) 554))
                   ;; We got a "550 relay not permitted" (or the like),
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 5319ea43898..932fb5926fd 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -246,11 +246,12 @@ and HOST defaults to localhost."
             (process-put proc 'ready t)
             (unless (eq (match-end 0) (point-max))
               (error "Unexpected trailing text"))
-            (let ((error (match-string 1)))
+            (let ((error-text (match-string 1)))
               (delete-region (point) (point-max))
               (let ((callback (process-get proc 'callback)))
                 (process-put proc 'callback nil)
-                (if error (signal 'mpc-proc-error error))
+                (if error-text
+                    (process-put proc 'mpc-proc-error error-text))
                 (funcall callback)))))))))
 
 (defun mpc--proc-connect (host)
@@ -314,19 +315,23 @@ and HOST defaults to localhost."
            mpc-proc)
       (setq mpc-proc (mpc--proc-connect mpc-host))))
 
+(defun mpc-proc-check (proc)
+  (let ((error-text (process-get proc 'mpc-proc-error)))
+    (when error-text
+      (process-put proc 'mpc-proc-error nil)
+      (signal 'mpc-proc-error error-text))))
+
 (defun mpc-proc-sync (&optional proc)
   "Wait for MPC process until it is idle again.
 Return the buffer in which the process is/was running."
   (unless proc (setq proc (mpc-proc)))
   (unwind-protect
-      (condition-case err
-          (progn
-            (while (and (not (process-get proc 'ready))
-                        (accept-process-output proc)))
-            (if (process-get proc 'ready) (process-buffer proc)
-              ;; (delete-process proc)
-              (error "No response from MPD")))
-        (error (message "MPC: %s" err) (signal (car err) (cdr err))))
+      (progn
+        (while (and (not (process-get proc 'ready))
+                    (accept-process-output proc)))
+        (mpc-proc-check proc)
+        (if (process-get proc 'ready) (process-buffer proc)
+          (error "No response from MPD")))
     (unless (process-get proc 'ready)
       ;; (debug)
       (message "Killing hung process")
@@ -358,13 +363,13 @@ which will be concatenated with proper quoting before passing them to MPD."
                       "\n")))
       (if callback
           ;; (let ((buf (current-buffer)))
-            (process-put proc 'callback
-                         callback
-                         ;; (lambda ()
-                         ;;   (funcall callback
-                         ;;            (prog1 (current-buffer)
-                         ;;              (set-buffer buf)))))
-                         )
+          (process-put proc 'callback
+                       callback
+                       ;; (lambda ()
+                       ;;   (funcall callback
+                       ;;            (prog1 (current-buffer)
+                       ;;              (set-buffer buf)))))
+                       )
         ;; If `callback' is nil, we're executing synchronously.
         (process-put proc 'callback 'ignore)
         ;; This returns the process's buffer.
diff --git a/lisp/proced.el b/lisp/proced.el
index 94ea579ebd8..e4987bd926c 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -395,7 +395,7 @@ It is a list of lists (KEY PREDICATE REVERSE).")
   :group 'proced-faces)
 
 (defface proced-marked
-  '((t (:inherit font-lock-warning-face)))
+  '((t (:inherit error)))
   "Face used for marked processes."
   :group 'proced-faces)
 
diff --git a/lisp/view.el b/lisp/view.el
index 21479a70a72..be011d217fc 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -576,9 +576,9 @@ current buffer. "
         (cond
          ((or all-windows view-exits-all-viewing-windows)
           (dolist (window (get-buffer-window-list))
-            (quit-restore-window window)))
+            (quit-window nil window)))
          ((eq (window-buffer) (current-buffer))
-          (quit-restore-window)))
+          (quit-window)))
 
         (when exit-action
           (funcall exit-action buffer))
diff --git a/lisp/window.el b/lisp/window.el
index 75fa0b46a1c..e68af18ab8e 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2272,7 +2272,7 @@ another frame still exists.
 
 Functions quitting a window and consequently affected by this
 variable are `switch-to-prev-buffer', `delete-windows-on',
-`replace-buffer-in-windows' and `quit-restore-window'."
+`replace-buffer-in-windows' and `quit-window'."
   :type '(choice
           (const :tag "Never" nil)
           (const :tag "Automatic" automatic)
@@ -2795,7 +2795,7 @@ displayed there."
   (let* ((buffer (window-normalize-buffer buffer-or-name)))
     ;; If `buffer-or-name' is not on the selected frame we unrecord it
     ;; although it's not "here" (call it a feature).
-    (unrecord-buffer buffer)
+    (bury-buffer-internal buffer)
     ;; Handle case where `buffer-or-name' is nil and the current buffer
     ;; is shown in the selected window.
     (cond
@@ -2907,21 +2907,17 @@ all window-local buffer lists."
         ;; Unrecord BUFFER in WINDOW.
         (unrecord-window-buffer window buffer)))))
 
-(defun quit-restore-window (&optional window kill)
-  "Quit WINDOW in some way.
-WINDOW must be a live window and defaults to the selected window.
-Return nil.
+(defun quit-window (&optional kill window)
+  "Quit WINDOW and bury its buffer.
+WINDOW defaults to the selected window.
+With a prefix argument, kill the buffer instead.
 
 According to information stored in WINDOW's `quit-restore' window
 parameter either \(1) delete WINDOW and its frame, \(2) delete
 WINDOW, \(3) restore the buffer previously displayed in WINDOW,
 or \(4) make WINDOW display some other buffer than the present
-one.  If non-nil, reset `quit-restore' parameter to nil.
-
-Optional argument KILL non-nil means in addition kill WINDOW's
-buffer.  If KILL is nil, put WINDOW's buffer at the end of the
-buffer list.  Interactively, KILL is the prefix argument."
-  (interactive "i\nP")
+one.  If non-nil, reset `quit-restore' parameter to nil."
+  (interactive "P")
   (setq window (window-normalize-live-window window))
   (let ((buffer (window-buffer window))
         (quit-restore (window-parameter window 'quit-restore))
@@ -2932,12 +2928,9 @@ buffer list.  Interactively, KILL is the prefix argument."
                     (eq (window-buffer window) (nth 1 quit-restore)))
                (window-dedicated-p window))
            (setq deletable (window-deletable-p window)))
-      ;; WINDOW can be deleted.
-      (unrecord-buffer buffer)
+      ;; Check if WINDOW's frame can be deleted.
       (if (eq deletable 'frame)
-          ;; WINDOW's frame can be deleted.
           (delete-frame (window-frame window))
-        ;; Just delete WINDOW.
         (delete-window window))
       ;; If the previously selected window is still alive, select it.
       (when (window-live-p (nth 2 quit-restore))
@@ -2948,17 +2941,17 @@ buffer list.  Interactively, KILL is the prefix argument."
            ;; in the first place.
            (eq (window-buffer window) (nth 3 quit-restore)))
       (setq resize (with-current-buffer buffer temp-buffer-resize-mode))
-      ;; Unrecord buffer.
-      (unrecord-buffer buffer)
       (unrecord-window-buffer window buffer)
       ;; Display buffer stored in the quit-restore parameter.
       (set-window-dedicated-p window nil)
       (set-window-buffer window (nth 0 quit-restore))
       (set-window-start window (nth 1 quit-restore))
       (set-window-point window (nth 2 quit-restore))
-      (when (and resize (/= (nth 4 quit-restore) (window-total-size window)))
-        (window-resize
-         window (- (nth 4 quit-restore) (window-total-size window))))
+      (and resize
+           (/= (nth 4 quit-restore) (window-total-size window))
+           (window-resize window
+                          (- (nth 4 quit-restore)
+                             (window-total-size window))))
       ;; Reset the quit-restore parameter.
       (set-window-parameter window 'quit-restore nil)
       (when (window-live-p (nth 5 quit-restore))
@@ -2967,12 +2960,12 @@ buffer list.  Interactively, KILL is the prefix argument."
       ;; Otherwise, show another buffer in WINDOW and reset the
       ;; quit-restore parameter.
       (set-window-parameter window 'quit-restore nil)
-      (unrecord-buffer buffer)
       (switch-to-prev-buffer window 'bury-or-kill)))
 
     ;; Kill WINDOW's old-buffer if requested
-    (when kill (kill-buffer buffer))
-    nil))
+    (if kill
+        (kill-buffer buffer)
+      (bury-buffer-internal buffer))))
 
 ;;; Splitting windows.
 (defsubst window-split-min-size (&optional horizontal)
@@ -7045,39 +7038,6 @@ Return non-nil if the window was shrunk, nil otherwise."
        (with-current-buffer buffer-to-kill
          (remove-hook 'kill-buffer-hook delete-window-hook t))))))
 
-(defun quit-window (&optional kill window)
-  "Quit WINDOW and bury its buffer.
-With a prefix argument, kill the buffer instead.  WINDOW defaults
-to the selected window.
-
-If WINDOW is non-nil, dedicated, or a minibuffer window, delete
-it and, if it's alone on its frame, its frame too.  Otherwise, or
-if deleting WINDOW fails in any of the preceding cases, display
-another buffer in WINDOW using `switch-to-buffer'.
-
-Optional argument KILL non-nil means kill WINDOW's buffer.
-Otherwise, bury WINDOW's buffer, see `bury-buffer'."
-  (interactive "P")
-  (let ((buffer (window-buffer window)))
-    (if (or window
-            (window-minibuffer-p window)
-            (window-dedicated-p window))
-        ;; WINDOW is either non-nil, a minibuffer window, or dedicated;
-        ;; try to delete it.
-        (let* ((window (or window (selected-window)))
-               (frame (window-frame window)))
-          (if (frame-root-window-p window)
-              ;; WINDOW is alone on its frame.
-              (delete-frame frame)
-            ;; There are other windows on its frame, delete WINDOW.
-            (delete-window window)))
-      ;; Otherwise, switch to another buffer in the selected window.
-      (switch-to-buffer nil))
-
-    ;; Deal with the buffer.
-    (if kill
-        (kill-buffer buffer)
-      (bury-buffer buffer))))
 
 (defvar recenter-last-op nil
   "Indicates the last recenter operation performed.
diff --git a/src/ChangeLog b/src/ChangeLog
index 1b1a8f67e43..431a515def5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,45 @@
+2011-08-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buffer.c (Fbury_buffer_internal): Rename from Funrecord_buffer.
+        Change return value to nil.
+        (Frecord_buffer): Delete unused function.
+
+2011-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (Fcurrent_bidi_paragraph_direction): For unibyte
+        buffers, return left-to-right.
+        (set_cursor_from_row): Consider candidate row a win if its glyph
+        represents a newline and point is on that newline.  Fixes cursor
+        positioning on the newline at EOL of R2L text within L2R
+        paragraph, and vice versa.
+        (try_cursor_movement): Check continued rows, in addition to
+        continuation rows.  Fixes unwarranted scroll when point enters a
+        continued line of R2L text within an L2R paragraph, or vice versa.
+        (cursor_row_p): Consider the case of point being equal to
+        MATRIX_ROW_END_CHARPOS.  Prevents cursor being stuck when moving
+        from the end of a short line to the beginning of a continued line
+        of R2L text within L2R paragraph.
+        (RECORD_MAX_MIN_POS): For max_pos, use IT_CHARPOS even for
+        composed characters.
+
+        * bidi.c (bidi_check_type): Use xassert.
+        (bidi_cache_iterator_state): Update the disp_pos and disp_prop_p
+        members.
+
+2011-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c (bidi_get_type): Abort if we get zero as the bidi type of
+        a character.
+
+2011-08-23  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nsfont.m (ns_otf_to_script): Fix typo.
+
+2011-08-22  Kenichi Handa  <handa@m17n.org>
+
+        * chartab.c (Fset_char_table_extra_slot): Do not inhibit setting a
+        extra slot even if the purpose is char-code-property-table.
+
 2011-08-23  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (redisplay_window): When computing centering_position,
diff --git a/src/bidi.c b/src/bidi.c
index 7517eca5aed..425a0be9578 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -108,8 +108,12 @@ bidi_get_type (int ch, bidi_dir_t override)
     abort ();
 
   default_type = (bidi_type_t) XINT (CHAR_TABLE_REF (bidi_type_table, ch));
-  if (default_type == 0)
-    default_type = STRONG_L;
+  /* Every valid character code, even those that are unassigned by the
+     UCD, have some bidi-class property, according to
+     DerivedBidiClass.txt file.  Therefore, if we ever get UNKNOWN_BT
+     (= zero) code from CHAR_TABLE_REF, that's a bug.  */
+  if (default_type == UNKNOWN_BT)
+    abort ();
 
   if (override == NEUTRAL_DIR)
     return default_type;
@@ -142,11 +146,10 @@ bidi_get_type (int ch, bidi_dir_t override)
     }
 }
 
-static void
+static inline void
 bidi_check_type (bidi_type_t type)
 {
-  if (type < UNKNOWN_BT || type > NEUTRAL_ON)
-    abort ();
+  xassert (UNKNOWN_BT <= type && type <= NEUTRAL_ON);
 }
 
 /* Given a bidi TYPE of a character, return its category.  */
@@ -536,6 +539,8 @@ bidi_cache_iterator_state (struct bidi_it *bidi_it, int resolved)
       bidi_cache[idx].next_for_neutral = bidi_it->next_for_neutral;
       bidi_cache[idx].next_for_ws = bidi_it->next_for_ws;
       bidi_cache[idx].ignore_bn_limit = bidi_it->ignore_bn_limit;
+      bidi_cache[idx].disp_pos = bidi_it->disp_pos;
+      bidi_cache[idx].disp_prop_p = bidi_it->disp_prop_p;
     }
 
   bidi_cache_last_idx = idx;
diff --git a/src/buffer.c b/src/buffer.c
index 45d6fa36d04..832044ae6f4 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1698,27 +1698,16 @@ record_buffer (Lisp_Object buffer)
     call1 (Vrun_hooks, Qbuffer_list_update_hook);
 }
 
-DEFUN ("record-buffer", Frecord_buffer, Srecord_buffer, 1, 1, 0,
-       doc: /* Move BUFFER to the front of the buffer list.
-Return BUFFER.  */)
-  (Lisp_Object buffer)
-{
-  CHECK_BUFFER (buffer);
-
-  record_buffer (buffer);
-
-  return buffer;
-}
 
-  /* Move BUFFER to the end of the buffer (a)lists.  Do nothing if the
-     buffer is killed.  For the selected frame's buffer list this moves
-     BUFFER to its end even if it was never shown in that frame.  If
-     this happens we have a feature, hence `unrecord-buffer' should be
-     called only when BUFFER was shown in the selected frame.  */
+/* Move BUFFER to the end of the buffer (a)lists.  Do nothing if the
+   buffer is killed.  For the selected frame's buffer list this moves
+   BUFFER to its end even if it was never shown in that frame.  If
+   this happens we have a feature, hence `unrecord-buffer' should be
+   called only when BUFFER was shown in the selected frame.  */
 
-DEFUN ("unrecord-buffer", Funrecord_buffer, Sunrecord_buffer, 1, 1, 0,
-       doc: /* Move BUFFER to the end of the buffer list.
-Return BUFFER.  */)
+DEFUN ("bury-buffer-internal", Fbury_buffer_internal, Sbury_buffer_internal,
+       1, 1, 0,
+       doc: /* Move BUFFER to the end of the buffer list.  */)
   (Lisp_Object buffer)
 {
   Lisp_Object aelt, aelt_cons, tem;
@@ -1746,7 +1735,7 @@ Return BUFFER.  */)
   if (!NILP (Vrun_hooks))
     call1 (Vrun_hooks, Qbuffer_list_update_hook);
 
-  return buffer;
+  return Qnil;
 }
 
 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0,
@@ -6034,8 +6023,7 @@ Functions running this hook are `get-buffer-create',
   defsubr (&Sother_buffer);
   defsubr (&Sbuffer_enable_undo);
   defsubr (&Skill_buffer);
-  defsubr (&Srecord_buffer);
-  defsubr (&Sunrecord_buffer);
+  defsubr (&Sbury_buffer_internal);
   defsubr (&Sset_buffer_major_mode);
   defsubr (&Scurrent_buffer);
   defsubr (&Sset_buffer);
diff --git a/src/chartab.c b/src/chartab.c
index 0cabaac4cf5..1d4ac04312a 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -589,8 +589,6 @@ DEFUN ("set-char-table-extra-slot", Fset_char_table_extra_slot,
   (Lisp_Object char_table, Lisp_Object n, Lisp_Object value)
 {
   CHECK_CHAR_TABLE (char_table);
-  if (EQ (XCHAR_TABLE (char_table)->purpose, Qchar_code_property_table))
-    error ("Can't change extra-slot of char-code-property-table");
   CHECK_NUMBER (n);
   if (XINT (n) < 0
       || XINT (n) >= CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (char_table)))
diff --git a/src/nsfont.m b/src/nsfont.m
index 60f8c5321aa..c4d9123faef 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -303,7 +303,7 @@ static NSString
 {
     Lisp_Object script = assq_no_quit (XCAR (otf), Votf_script_alist);
     return CONSP (script)
-        ? [NSString stringWithUTF8String: SDATA (SYMBOL_NAME XCDR ((script)))]
+        ? [NSString stringWithUTF8String: SDATA (SYMBOL_NAME (XCDR ((script))))]
         : @"";
 }
 
diff --git a/src/process.c b/src/process.c
index 2125478907f..977cfb964e2 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5186,6 +5186,9 @@ read_process_output (Lisp_Object proc, register int channel)
           p->decoding_carryover = coding->carryover_bytes;
         }
       if (SBYTES (text) > 0)
+        /* FIXME: It's wrong to wrap or not based on debug-on-error, and
+           sometimes it's simply wrong to wrap (e.g. when called from
+           accept-process-output).  */
         internal_condition_case_1 (read_process_output_call,
                                    Fcons (outstream,
                                           Fcons (proc, Fcons (text, Qnil))),
diff --git a/src/xdisp.c b/src/xdisp.c
index f38c2828b8e..580bd59908b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13857,7 +13857,14 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                           && glyph->charpos != pt_old)))))
         return 0;
       /* If this candidate gives an exact match, use that.  */
-      if (!(BUFFERP (glyph->object) && glyph->charpos == pt_old)
+      if (!((BUFFERP (glyph->object) && glyph->charpos == pt_old)
+            /* If this candidate is a glyph created for the
+               terminating newline of a line, and point is on that
+               newline, it wins because it's an exact match.  */
+            || (!row->continued_p
+                && INTEGERP (glyph->object)
+                && glyph->charpos == 0
+                && pt_old == MATRIX_ROW_END_CHARPOS (row) - 1))
           /* Otherwise, keep the candidate that comes from a row
              spanning less buffer positions.  This may win when one or
              both candidate positions are on glyphs that came from
@@ -14639,7 +14646,8 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                     }
                   ++row;
                 }
-              while ((MATRIX_ROW_CONTINUATION_LINE_P (row)
+              while (((MATRIX_ROW_CONTINUATION_LINE_P (row)
+                       || row->continued_p)
                       && MATRIX_ROW_BOTTOM_Y (row) <= last_y)
                      || (MATRIX_ROW_START_CHARPOS (row) == PT
                          && MATRIX_ROW_BOTTOM_Y (row) < last_y));
@@ -18114,7 +18122,8 @@ cursor_row_p (struct glyph_row *row)
 {
   int result = 1;
 
-  if (PT == CHARPOS (row->end.pos))
+  if (PT == CHARPOS (row->end.pos)
+      || PT == MATRIX_ROW_END_CHARPOS (row))
     {
       /* Suppose the row ends on a string.
          Unless the row is continued, that means it ends on a newline
@@ -18509,10 +18518,10 @@ display_line (struct it *it)
           min_pos = current_pos;                                \
           min_bpos = current_bpos;                              \
         }                                                       \
-      if (current_pos > max_pos)                                \
+      if (IT_CHARPOS (*it) > max_pos)                           \
         {                                                       \
-          max_pos = current_pos;                                \
-          max_bpos = current_bpos;                              \
+          max_pos = IT_CHARPOS (*it);                           \
+          max_bpos = IT_BYTEPOS (*it);                          \
         }                                                       \
     }                                                           \
   while (0)
@@ -19119,7 +19128,8 @@ See also `bidi-paragraph-direction'.  */)
       buf = XBUFFER (buffer);
     }
 
-  if (NILP (BVAR (buf, bidi_display_reordering)))
+  if (NILP (BVAR (buf, bidi_display_reordering))
+      || NILP (BVAR (buf, enable_multibyte_characters)))
     return Qleft_to_right;
   else if (!NILP (BVAR (buf, bidi_paragraph_direction)))
     return BVAR (buf, bidi_paragraph_direction);