Merge changes from emacs-23 branch

3 files changed, 59 insertions, 6 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index e0f292812bf..03f2edb55b2 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-27  Ulrich Mueller  <ulm@gentoo.org>
+
+        * HELLO: Add ancient Greek (Bug#7418).
+
 2010-11-13  Eli Zaretskii  <eliz@gnu.org>
 
         * NEWS: Document display of glyphless characters.
diff --git a/etc/HELLO b/etc/HELLO
index f7320f7301f..5461d4cd7ef 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -33,6 +33,7 @@ French (fran,Ag(Bais)	Bonjour / Salut
 Georgian ($,1JEJ0J@J7J5J4J:J8(B)      $,1J2J0J;J0J@JOJ=J1J0(B
 German (Deutsch)        Guten Tag / Gr,A|_(B Gott
 Greek (,Fekkgmij\(B)  ,FCei\(B ,Fsar(B
+Greek, ancient ($,1p1,Fkkgmij^(B)    ,FO$,1pv,Fk](B ,Fte(B ,Fja$,1q6(B ,Fl]ca(B ,Fwa$,1r6,Fqe(B
 Gujarati ($,19W:!9\9p9~9d: (B)        $,19h9n9x:-9d:'(B
 Hebrew $,1ro(B($,1-",q-(,y-*(B)     ,Hylem(B
 Hungarian (magyar)      Sz,Bi(Bp j,Bs(B napot!
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 0d37746d460..0608286e6d5 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -21,9 +21,6 @@ with a prefix argument or by typing C-u C-h C-n.
 
 * Changes in Emacs 23.3
 
-** The nextstep port can have different modifiers for the left and right
-alt/option key by customizing the value for ns-right-alternate-modifier.
-
 
 * Editing Changes in Emacs 23.3
 
@@ -34,6 +31,42 @@ alt/option key by customizing the value for ns-right-alternate-modifier.
 ** The appt-add command takes an optional argument for the warning time.
 This can be used in place of the default appt-message-warning-time.
 
+---
+** You can allow inferior Python processes to load modules from the
+current directory by setting `python-remove-cwd-from-path' to nil.
+
+** VC and related modes
+
+*** New VC command `vc-log-incoming', bound to `C-x v I'.
+This shows a log of changes to be received with a pull operation.
+For Git, this runs "git fetch" to make the necessary data available
+locally; this requires version 1.7 or newer.
+
+*** New VC command `vc-log-outgoing', bound to `C-x v O'.
+This shows a log of changes to be sent in the next commit.
+
+*** New VC command vc-find-conflicted-file.
+
++++
+*** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers
+reruns the corresponding VC command to compute an up to date version
+of the buffer.
+
+*** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
+
++++
+*** Special markup can be added to log-edit buffers.
+You can add headers specifying additional information to be supplied
+to the version control system.  For example:
+
+  Author: J. R. Hacker <jrh@example.com>
+  Fixes: 4204
+  Actual text of log entry...
+
+Bazaar recognizes the headers "Author", "Date" and "Fixes".
+Git, Mercurial, and Monotone recognize "Author" and "Date".
+Any unknown header is left as is in the message, so it is not lost.
+
 ** Obsolete packages
 
 +++
@@ -41,10 +74,12 @@ This can be used in place of the default appt-message-warning-time.
 
 
 * New Modes and Packages in Emacs 23.3
+
 ** smie.el is a generic navigation and indentation engine.
 It takes a simple BNF description of the grammar, and provides both
 sexp-style navigation (jumping over begin..end pairs) as well as
 indentation, which can be adjusted via ad-hoc indentation rules.
+
 
 * Incompatible Lisp Changes in Emacs 23.3
 
@@ -55,16 +90,29 @@ starting from the first line of text below the header line.
 
 * Lisp changes in Emacs 23.3
 
++++
 ** `e' and `pi' are now called `float-e' and `float-pi'.
   The old names are obsolete.
-** The use of unintern without an obarray arg is declared obsolete.
-** The function `princ-list' is declared obsolete.
-** The yank-handler argument to kill-region and friends is declared obsolete.
+
++++
+** The use of unintern without an obarray arg is now obsolete.
+
+---
+** The function `princ-list' is now obsolete.
+
++++
+** The yank-handler argument to kill-region and friends is now obsolete.
+
++++
 ** New function byte-to-string, like char-to-string but for bytes.
 
 
 * Changes in Emacs 23.3 on non-free operating systems
 
++++
+** The nextstep port can have different modifiers for the left and right
+alt/option key by customizing the value for ns-right-alternate-modifier.
+
 
 * Installation Changes in Emacs 23.2