procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-24; up to 2012-11-13T18:57:26Z!dgutov@yandex.ru

Browse source
This commit is contained in:
Glenn Morris 2012-11-16 09:20:23 -08:00
commit 96e055075d
39 changed files with 609 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/emacs-lisp/checkdoc.el
View file

@ -124,7 +124,7 @@
;; Adding your own checks:
;;
;; You can experiment with adding your own checks by setting the
;; hooks `checkdoc-style-functions' and `checkdoc-comment-style-hooks'.
;; hooks `checkdoc-style-functions' and `checkdoc-comment-style-functions'.
;; Return a string which is the error you wish to report. The cursor
;; position should be preserved.
;;

2
lisp/emacs-lisp/cl-lib.el
View file

@ -3,7 +3,7 @@
;; Copyright (C) 1993, 2001-2012 Free Software Foundation, Inc.
;; Author: Dave Gillespie <daveg@synaptics.com>
;; Version: 2.02
;; Version: 1.0
;; Keywords: extensions
;; This file is part of GNU Emacs.

10
lisp/emacs-lisp/cl-macs.el
View file

@ -758,7 +758,7 @@ This is compatible with Common Lisp, but note that `defun' and
;;;###autoload
(defmacro cl-loop (&rest loop-args)
"The Common Lisp `cl-loop' macro.
"The Common Lisp `loop' macro.
Valid clauses are:
for VAR from/upfrom/downfrom NUM to/upto/downto/above/below NUM by NUM,
for VAR in LIST by FUNC, for VAR on LIST by FUNC, for VAR = INIT then EXPR,
@ -1503,7 +1503,7 @@ such that COMBO is equivalent to (and . CLAUSES)."
;;;###autoload
(defmacro cl-do (steps endtest &rest body)
"The Common Lisp `cl-do' loop.
"The Common Lisp `do' loop.
\(fn ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)"
(declare (indent 2)
@ -1515,7 +1515,7 @@ such that COMBO is equivalent to (and . CLAUSES)."
;;;###autoload
(defmacro cl-do* (steps endtest &rest body)
"The Common Lisp `cl-do*' loop.
"The Common Lisp `do*' loop.
\(fn ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)"
(declare (indent 2) (debug cl-do))
@ -1650,7 +1650,7 @@ a `let' form, except that the list of symbols can be computed at run-time."
;;;###autoload
(defmacro cl-flet (bindings &rest body)
"Make temporary function definitions.
"Make local function definitions.
Like `cl-labels' but the definitions are not recursive.
\(fn ((FUNC ARGLIST BODY...) ...) FORM...)"
@ -1674,7 +1674,7 @@ Like `cl-labels' but the definitions are not recursive.
;;;###autoload
(defmacro cl-flet* (bindings &rest body)
"Make temporary function definitions.
"Make local function definitions.
Like `cl-flet' but the definitions can refer to previous ones.
\(fn ((FUNC ARGLIST BODY...) ...) FORM...)"

2
lisp/emacs-lisp/eieio-datadebug.el
View file

@ -131,7 +131,7 @@ PREBUTTONTEXT is some text between PREFIX and the object button."
(defun eieio-debug-methodinvoke (method class)
"Show the method invocation order for METHOD with CLASS object."
(interactive "aMethod: \nXClass Expression: ")
(let* ((eieio-pre-method-execution-hooks
(let* ((eieio-pre-method-execution-functions
(lambda (l) (throw 'moose l) ))
(data
(catch 'moose (eieio-generic-call