master updated (474241f356 -> 231cf5ee2b)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  474241f356 Remedy ineffective backslashes and fix regexps
       new  cd7f7c2c33 Fix more defcustom :type errors
       new  9fae7b8e03 Regenerated ldefs-boot.el
       new  5a12148503 Use `nicknames' instead if `'nicknames' in 
erc-button-alist
       new  231cf5ee2b Warn about quoted symbols in defcustom choice/other forms


Summary of changes:
 etc/NEWS                               | 13 ++++++++++
 lisp/emacs-lisp/bytecomp.el            | 32 ++++++++++++++++++++---
 lisp/erc/erc-button.el                 | 18 ++++++-------
 lisp/ldefs-boot.el                     | 47 +++++++++++++++++++++++++++++++---
 lisp/vc/vc-rcs.el                      |  2 +-
 lisp/vc/vc-src.el                      |  2 +-
 test/lisp/emacs-lisp/bytecomp-tests.el |  6 +++++
 7 files changed, 101 insertions(+), 19 deletions(-)