Commit 06b583de authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2012-12-23T17:06:58Z!eliz@gnu.org

parents 81c23309 b270d116
......@@ -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.
......
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.
......
......@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment