diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-03-02 12:10:05 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-03-02 12:10:05 -0800 |
| commit | 06b583dec7cbde714c8fb991a1e123f612b66e3a (patch) | |
| tree | afd7b125be231e2c4234f32220f84bdd4e25b50e | |
| parent | 81c23309e40ca529714e765b4534d6a1f4634887 (diff) | |
| parent | b270d11649521531b4b51df937149b463b8d61a8 (diff) | |
| download | emacs-06b583dec7cbde714c8fb991a1e123f612b66e3a.tar.gz | |
Merge from emacs-24; up to 2012-12-23T17:06:58Z!eliz@gnu.org
| -rw-r--r-- | etc/NEWS | 23 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
3 files changed, 28 insertions, 1 deletions
@@ -780,6 +780,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. diff --git a/src/ChangeLog b/src/ChangeLog index a68b16f862c..d8b2833b2fa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-03-02 Andreas Schwab <schwab@linux-m68k.org> + + * lisp.h (XPNTR) [!USE_LSB_TAG]: Remove extra paren. (Bug#13734) + 2013-03-02 Paul Eggert <eggert@cs.ucla.edu> * textprop.c: Use bool for booleans. diff --git a/src/lisp.h b/src/lisp.h index e696371c58b..01574a5fe03 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -507,7 +507,7 @@ static EMACS_INT const VALMASK /* 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 */ |