auto upstream

2 files changed, 39 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index a13ab60be36..7ebb2a751ab 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * NEWS: The lock for FILE is now .#FILE or .#-FILE (Bug#13807).
+
 2013-03-01  Michael Albinus  <michael.albinus@gmx.de>
 
         * NEWS: Fix Tramp "adb" entry.  Extend list of discontinued Tramp
diff --git a/etc/NEWS b/etc/NEWS
index d937ae70166..73f7991823f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -320,6 +320,18 @@ text-property on the first char.
 ** The `defalias-fset-function' property lets you catch calls to defalias
 and redirect them to your own function instead of `fset'.
 
+** The lock for 'DIR/FILE' is now 'DIR/.#FILE' or 'DIR/.#-FILE'.
+When you edit DIR/FILE, Emacs normally creates a symbolic link
+DIR/.#FILE as a lock that warns other instances of Emacs that DIR/FILE
+is being edited.  Formerly, if there was already a non-symlink file
+named DIR/.#FILE, Emacs fell back on the lock names DIR/.#FILE.0
+through DIR/.#FILE.9.  These fallbacks have been removed, so that
+Emacs now no longer locks DIR/FILE in that case.
+
+On MS-Windows the lock is a regular file DIR/.#-FILE, not a symlink.
+MS-Windows and non-MS-Windows implementations of Emacs ignore each
+other's locks.
+
 ** The 9th element returned by `file-attributes' is now unspecified.
 Formerly, it was t if the file's gid would change if file were deleted
 and recreated.  This value has been inaccurate for years on many
@@ -780,6 +792,29 @@ Sphinx support has been improved.
 
 *** The constant `rst-version' describes the rst.el package version.
 
+** Ruby mode
+
+*** Support for percent literals and recognition of regular expressions
+in method calls without parentheses with more methods, including Cucumber
+steps definitions.
+
+*** Improved syntax highlighting and indentation.
+
+*** New command `ruby-toggle-block', bound to `C-c {'.
+
+*** Some non-standard keybindings/commands have been removed:
+
+**** `ruby-electric-brace'; use `electric-indent-mode' instead.
+
+**** `ruby-mark-defun'; use `mark-defun'.
+
+**** `ruby-beginning-of-defun' and `ruby-end-of-defun' are replaced by
+appropriate settings for the variables `beginning-of-defun-function'
+and `end-of-defun-function'.
+
+**** Non-standard keybindings for `backward-kill-word', `comment-region',
+`reindent-then-newline-and-indent' and `newline' have been removed.
+
 ** Shell Script mode
 
 *** Pairing of parens/quotes uses `electric-pair-mode' instead of skeleton-pair.