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

Merge from emacs--devo--0

Browse source 
Patches applied:

 * emacs--devo--0  (patch 662-669)

   - Update from CVS
   - Fix read-only prompt problem in isearch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 207-208)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-184
This commit is contained in:
Miles Bader 2007-03-18 14:11:08 +00:00
commit a72ea5f5b0
87 changed files with 2037 additions and 597 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,7 @@ files.")
("Francesco Potort,Al(B" "Francesco Potorti" "Francesco Potorti`")
("Frederic Pierresteguy" "Fred Pierresteguy")
("Geoff Voelker" "voelker")
("Gerd M,Av(Bllmann" "Gerd Moellmann")
("Hallvard B. Furuseth" "Hallvard B Furuseth")
("Hrvoje Nik,B9(Bi,Bf(B" "Hrvoje Niksic")
(nil "(afs@hplb.hpl.hp.com)")
@ -102,6 +103,7 @@ files.")
("Kyle Jones" "Kyle E. Jones")
("Marcus G. Daniels" "Marcus Daniels")
("Mark D. Baushke" "Mark D Baushke")
("Agust,Am(Bn Mart,Am(Bn" "Agustin Martin")
("Martin Lorentzon" "Martin Lorentzson")
("Matt Swift" "Matthew Swift")
("Michael R. Mauger" "Michael Mauger")

6
lisp/emacs-lisp/bytecomp.el
View file

@ -972,8 +972,10 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
(pos (if (and byte-compile-current-file
(integerp byte-compile-read-position))
(with-current-buffer byte-compile-current-buffer
(format "%d:%d:" (count-lines (point-min)
byte-compile-last-position)
(format "%d:%d:"
(save-excursion
(goto-char byte-compile-last-position)
(1+ (count-lines (point-min) (point-at-bol))))
(save-excursion
(goto-char byte-compile-last-position)
(1+ (current-column)))))

11
lisp/emacs-lisp/edebug.el
View file

@ -2939,6 +2939,7 @@ MSG is printed after `::::} '."
(edebug-overlay-arrow))
(setq buffer-read-only edebug-buffer-read-only)
(use-local-map edebug-outside-map)
(remove-hook 'kill-buffer-hook 'edebug-kill-buffer t)
)
;; gotta have a buffer to let its buffer local variables be set
(get-buffer-create " bogus edebug buffer"))
@ -3942,8 +3943,18 @@ edebug-on-signal
edebug-unwrap-results
edebug-global-break-condition
"
;; If the user kills the buffer in which edebug is currently active,
;; exit to top level, because the edebug command loop can't usefully
;; continue running in such a case.
(add-hook 'kill-buffer-hook 'edebug-kill-buffer nil t)
(use-local-map edebug-mode-map))
(defun edebug-kill-buffer ()
"Used on `kill-buffer-hook' when Edebug is operating in a buffer of Lisp code."
(let (kill-buffer-hook)
(kill-buffer (current-buffer)))
(top-level))
;;; edebug eval list mode
;; A list of expressions and their evaluations is displayed in *edebug*.

59
lisp/emacs-lisp/lisp-mode.el
View file

@ -909,34 +909,47 @@ is the buffer position of the start of the containing expression."
(cond ((elt state 3)
;; Inside a string, don't change indentation.
nil)
((save-excursion
;; test whether current line begins with a constant
(goto-char indent-point)
(skip-chars-forward " \t")
(looking-at ":"))
(let ((desired-indent
(save-excursion
(goto-char (1+ containing-sexp))
(parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
(point)))
(parse-sexp-ignore-comments t))
;; Align a constant symbol under the last constant symbol
(goto-char calculate-lisp-indent-last-sexp)
(while (> (point) desired-indent)
(if (looking-at ":")
(setq desired-indent (point))
(backward-sexp 1))))
(current-column))
((and (integerp lisp-indent-offset) containing-sexp)
;; Indent by constant offset
(goto-char containing-sexp)
(+ (current-column) lisp-indent-offset))
;; in this case calculate-lisp-indent-last-sexp is not nil
(calculate-lisp-indent-last-sexp
(or
;; try to align the parameters of a known function
(and lisp-indent-function
(not retry)
(funcall lisp-indent-function indent-point state))
;; If the function has no special alignment
;; or it does not apply to this argument,
;; try to align a constant-symbol under the last
;; preceding constant symbol, if there is such one of
;; the last 2 preceding symbols, in the previous
;; uncommented line.
(and (save-excursion
(goto-char indent-point)
(skip-chars-forward " \t")
(looking-at ":"))
(> calculate-lisp-indent-last-sexp
(save-excursion
(goto-char (1+ containing-sexp))
(parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
(point)))
(let ((parse-sexp-ignore-comments t)
indent)
(goto-char calculate-lisp-indent-last-sexp)
(or (and (looking-at ":")
(setq indent (current-column)))
(and (< (save-excursion (beginning-of-line) (point))
(prog2 (backward-sexp) (point)))
(looking-at ":")
(setq indent (current-column))))
indent))
;; another symbols or constants not preceded by a constant
;; as defined above.
normal-indent))
;; in this case calculate-lisp-indent-last-sexp is nil
(desired-indent)
((and (boundp 'lisp-indent-function)
lisp-indent-function
(not retry))
(or (funcall lisp-indent-function indent-point state)
normal-indent))
(t
normal-indent))))))

5
lisp/emacs-lisp/re-builder.el
View file

@ -130,14 +130,13 @@
(defcustom reb-re-syntax 'read
"*Syntax for the REs in the RE Builder.
Can either be `read', `string', `sregex' or `lisp-re'."
Can either be `read', `string', `sregex', `lisp-re', `rx'."
:group 're-builder
:type '(choice (const :tag "Read syntax" read)
(const :tag "String syntax" string)
(const :tag "`sregex' syntax" sregex)
(const :tag "`lisp-re' syntax" lisp-re)
(const :tag "`rx' syntax" rx)
(value: string)))
(const :tag "`rx' syntax" rx)))
(defcustom reb-auto-match-limit 200
"*Positive integer limiting the matches for RE Builder auto updates.