mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-18 18:05:07 +00:00
Code Issues Releases Activity

(c-defun-name): Fix CLISP DEFUN handling.

Browse Source
This commit is contained in:
Sam Steingold 2008-11-07 15:39:53 +00:00
parent 69135f1297
commit 3f71582da6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2008-11-07 Sam Steingold <sds@gnu.org>
* progmodes/cc-cmds.el (c-defun-name): Fix CLISP DEFUN handling.
2008-11-07 Juanma Barranquero <lekktu@gmail.com>
* frame.el (make-frame-on-display): Use `string-match-p'.

10
lisp/progmodes/cc-cmds.el
View File

@ -522,7 +522,7 @@ inside a literal or a macro, nothing special happens."
;; This is the list of brace syntactic symbols that can hang.
;; If any new ones are added to c-offsets-alist, they should be
;; added here as well.
;;
;;
;; The order of this list is important; if SYNTAX has several
;; elements, the element that "wins" is the earliest in SYMS.
'(arglist-cont-nonempty ; e.g. an array literal.
@ -1685,7 +1685,7 @@ with a brace block."
(c-save-buffer-state
(beginning-of-defun-function end-of-defun-function
where pos name-end)
(save-excursion
;; Move back out of any macro/comment/string we happen to be in.
(c-beginning-of-macro)
@ -1717,7 +1717,7 @@ with a brace block."
((looking-at "DEFUN\\_>")
;; DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, ...) ==> Ffile_name_directory
;; DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) ==> POSIX::STREAM-LOCK
;; DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) ==> POSIX::STREAM-LOCK
(down-list 1)
(c-forward-syntactic-ws)
(when (eq (char-after) ?\")
@ -1727,9 +1727,11 @@ with a brace block."
(point)
(progn
(c-forward-token-2)
(when (looking-at ":") ; CLISP: DEFUN(PACKAGE:LISP-SYMBOL,...)
(skip-chars-forward "^,"))
(c-backward-syntactic-ws)
(point))))
(t
;; Normal function or initializer.
(when (c-syntactic-re-search-forward "[{(]" nil t)