emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111917: Merge from emacs-24; up to r


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111917: Merge from emacs-24; up to r111311
Date: Sat, 02 Mar 2013 12:10:05 -0800
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111917 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-02 12:10:05 -0800
message:
  Merge from emacs-24; up to r111311
modified:
  etc/NEWS
  src/ChangeLog
  src/lisp.h
=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-03-01 08:24:19 +0000
+++ b/etc/NEWS  2013-03-02 20:10:05 +0000
@@ -780,6 +780,29 @@
 
 *** 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.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-02 18:39:34 +0000
+++ b/src/ChangeLog     2013-03-02 20:10:05 +0000
@@ -1,3 +1,7 @@
+2013-03-02  Andreas Schwab  <address@hidden>
+
+       * lisp.h (XPNTR) [!USE_LSB_TAG]: Remove extra paren.  (Bug#13734)
+
 2013-03-02  Paul Eggert  <address@hidden>
 
        * textprop.c: Use bool for booleans.

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-03-02 09:02:12 +0000
+++ b/src/lisp.h        2013-03-02 20:10:05 +0000
@@ -507,7 +507,7 @@
 
 /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers
    which were stored in a Lisp_Object.  */
-#define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK)) | DATA_SEG_BITS))
+#define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK) | DATA_SEG_BITS))
 
 #endif /* not USE_LSB_TAG */
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]