Mercurial > emacs
view lisp/obsolete/lucid.el @ 106395:f2b36fb84bf7
Enhance `c-parse-state' to run efficiently in "brace desserts".
* progmodes/cc-mode.el (c-basic-common-init): Call
c-state-cache-init.
(c-neutralize-syntax-in-and-mark-CPP): Renamed from
c-extend-and-neutralize-syntax-in-CPP. Mark each CPP construct by
placing `category' properties value 'c-cpp-delimiter at its
boundaries.
* progmodes/cc-langs.el (c-before-font-lock-function):
c-extend-and-neutralize-syntax-in-CPP has been renamed
c-neutralize-syntax-in-and-mark-CPP.
* progmodes/cc-fonts.el (c-cpp-matchers): Mark template brackets
with `category' properties now, not `syntax-table' ones.
* progmodes/cc-engine.el (c-syntactic-end-of-macro): A new
enhanced (but slower) version of c-end-of-macro that won't land
inside a literal or on another awkward character.
(c-state-cache-too-far, c-state-cache-start)
(c-state-nonlit-pos-interval, c-state-nonlit-pos-cache)
(c-state-nonlit-pos-cache-limit, c-state-point-min)
(c-state-point-min-lit-type, c-state-point-min-lit-start)
(c-state-min-scan-pos, c-state-brace-pair-desert)
(c-state-old-cpp-beg, c-state-old-cpp-end): New constants and
buffer local variables.
(c-state-literal-at, c-state-lit-beg)
(c-state-cache-non-literal-place, c-state-get-min-scan-pos)
(c-state-mark-point-min-literal, c-state-cache-top-lparen)
(c-state-cache-top-paren, c-state-cache-after-top-paren)
(c-get-cache-scan-pos, c-get-fallback-scan-pos)
(c-state-balance-parens-backwards, c-parse-state-get-strategy)
(c-renarrow-state-cache)
(c-append-lower-brace-pair-to-state-cache)
(c-state-push-any-brace-pair, c-append-to-state-cache)
(c-remove-stale-state-cache)
(c-remove-stale-state-cache-backwards, c-state-cache-init)
(c-invalidate-state-cache-1, c-parse-state-1)
(c-invalidate-state-cache): New defuns/defmacros/defsubsts.
(c-parse-state): Enhanced and refactored.
(c-debug-parse-state): Amended to deal with all the new variables.
* progmodes/cc-defs.el (c-<-as-paren-syntax, c-mark-<-as-paren)
(c->-as-paren-syntax, c-mark->-as-paren, c-unmark-<->-as-paren):
modify to use category text properties rather than syntax-table
ones.
(c-suppress-<->-as-parens, c-restore-<->-as-parens): new defsubsts
to switch off/on the syntactic paren property of C++ template
delimiters using the category property.
(c-with-<->-as-parens-suppressed): Macro to invoke code with
template delims suppressed.
(c-cpp-delimiter, c-set-cpp-delimiters, c-clear-cpp-delimiters):
New constant/macros which apply category properties to the start
and end of preprocessor constructs.
(c-comment-out-cpps, c-uncomment-out-cpps): defsubsts which
"comment out" the syntactic value of characters in preprocessor
constructs.
(c-with-cpps-commented-out)
(c-with-all-but-one-cpps-commented-out): Macros to invoke code
with characters in all or all but one preprocessor constructs
"commented out".
author | Alan Mackenzie <acm@muc.de> |
---|---|
date | Thu, 03 Dec 2009 16:02:10 +0000 |
parents | b4d1d7858370 |
children | 1d1d5d9bd884 |
line wrap: on
line source
;;; lucid.el --- emulate some Lucid Emacs functions ;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations ;; Obsolete-since: 23.2 ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;;; Code: ;; XEmacs autoloads CL so we might as well make use of it. (require 'cl) (defalias 'current-time-seconds 'current-time) (defun read-number (prompt &optional integers-only) "Read a number from the minibuffer. Keep reentering the minibuffer until we get suitable input. If optional argument INTEGERS-ONLY is non-nil, insist on an integer." (interactive) (let (success (number nil) (predicate (if integers-only 'integerp 'numberp))) (while (not success) (let ((input-string (read-string prompt))) (condition-case () (setq number (read input-string)) (error)) (if (funcall predicate number) (setq success t) (let ((cursor-in-echo-area t)) (message "Please type %s" (if integers-only "an integer" "a number")) (sit-for 1))))) number)) (defun real-path-name (name &optional default) (file-truename (expand-file-name name default))) ;; It's not clear what to return if the mouse is not in FRAME. (defun read-mouse-position (frame) (let ((pos (mouse-position))) (if (eq (car pos) frame) (cdr pos)))) (defun switch-to-other-buffer (arg) "Switch to the previous buffer. With a numeric arg N, switch to the Nth most recent buffer. With an arg of 0, buries the current buffer at the bottom of the buffer stack." (interactive "p") (if (eq arg 0) (bury-buffer (current-buffer))) (switch-to-buffer (if (<= arg 1) (other-buffer (current-buffer)) (nth arg (apply 'nconc (mapcar (lambda (buf) (if (= ?\ (string-to-char (buffer-name buf))) nil (list buf))) (buffer-list))))))) (defun device-class (&optional device) "Return the class (color behavior) of DEVICE. This will be one of 'color, 'grayscale, or 'mono. This function exists for compatibility with XEmacs." (cond ((display-color-p device) 'color) ((display-grayscale-p device) 'grayscale) (t 'mono))) (defalias 'find-face 'internal-find-face) (defalias 'get-face 'internal-get-face) ;; internal-try-face-font was removed from faces.el in rev 1.139, 1999/07/21. ;;;(defalias 'try-face-font 'internal-try-face-font) (defalias 'exec-to-string 'shell-command-to-string) ;; Buffer context (defun buffer-syntactic-context (&optional buffer) "Syntactic context at point in BUFFER. Either of `string', `comment' or nil. This is an XEmacs compatibility function." (with-current-buffer (or buffer (current-buffer)) (let ((state (syntax-ppss (point)))) (cond ((nth 3 state) 'string) ((nth 4 state) 'comment))))) (defun buffer-syntactic-context-depth (&optional buffer) "Syntactic parenthesis depth at point in BUFFER. This is an XEmacs compatibility function." (with-current-buffer (or buffer (current-buffer)) (nth 0 (syntax-ppss (point))))) ;; Extents (defun make-extent (beg end &optional buffer) (make-overlay beg end buffer)) (defun extent-properties (extent) (overlay-properties extent)) (unless (fboundp 'extent-property) (defalias 'extent-property 'overlay-get)) (defun extent-at (pos &optional object property before) (with-current-buffer (or object (current-buffer)) (let ((overlays (overlays-at pos))) (when property (let (filtered) (while overlays (if (overlay-get (car overlays) property) (setq filtered (cons (car overlays) filtered))) (setq overlays (cdr overlays))) (setq overlays filtered))) (setq overlays (sort overlays (function (lambda (o1 o2) (let ((p1 (or (overlay-get o1 'priority) 0)) (p2 (or (overlay-get o2 'priority) 0))) (or (> p1 p2) (and (= p1 p2) (> (overlay-start o1) (overlay-start o2))))))))) (if before (nth 1 (memq before overlays)) (car overlays))))) (defun set-extent-property (extent prop value) ;; Make sure that separate adjacent extents ;; with the same mouse-face value ;; do not run together as one extent. (and (eq prop 'mouse-face) (symbolp value) (setq value (list value))) (if (eq prop 'duplicable) (cond ((and value (not (overlay-get extent prop))) ;; If becoming duplicable, copy all overlayprops to text props. (add-text-properties (overlay-start extent) (overlay-end extent) (overlay-properties extent) (overlay-buffer extent))) ;; If becoming no longer duplicable, remove these text props. ((and (not value) (overlay-get extent prop)) (remove-text-properties (overlay-start extent) (overlay-end extent) (overlay-properties extent) (overlay-buffer extent)))) ;; If extent is already duplicable, put this property ;; on the text as well as on the overlay. (if (overlay-get extent 'duplicable) (put-text-property (overlay-start extent) (overlay-end extent) prop value (overlay-buffer extent)))) (overlay-put extent prop value)) (defun set-extent-face (extent face) (set-extent-property extent 'face face)) (defun set-extent-end-glyph (extent glyph) (set-extent-property extent 'after-string glyph)) (defun delete-extent (extent) (set-extent-property extent 'duplicable nil) (delete-overlay extent)) ;; Support the Lucid names with `screen' instead of `frame'. (defalias 'current-screen-configuration 'current-frame-configuration) (defalias 'delete-screen 'delete-frame) (defalias 'find-file-new-screen 'find-file-other-frame) (defalias 'find-file-read-only-new-screen 'find-file-read-only-other-frame) (defalias 'find-tag-new-screen 'find-tag-other-frame) ;;(defalias 'focus-screen 'focus-frame) (defalias 'iconify-screen 'iconify-frame) (defalias 'mail-new-screen 'mail-other-frame) (defalias 'make-screen-invisible 'make-frame-invisible) (defalias 'make-screen-visible 'make-frame-visible) ;; (defalias 'minibuffer-screen-list 'minibuffer-frame-list) (defalias 'modify-screen-parameters 'modify-frame-parameters) (defalias 'next-screen 'next-frame) ;; (defalias 'next-multiscreen-window 'next-multiframe-window) ;; (defalias 'previous-multiscreen-window 'previous-multiframe-window) ;; (defalias 'redirect-screen-focus 'redirect-frame-focus) (defalias 'redraw-screen 'redraw-frame) ;; (defalias 'screen-char-height 'frame-char-height) ;; (defalias 'screen-char-width 'frame-char-width) ;; (defalias 'screen-configuration-to-register 'frame-configuration-to-register) ;; (defalias 'screen-focus 'frame-focus) (defalias 'screen-list 'frame-list) ;; (defalias 'screen-live-p 'frame-live-p) (defalias 'screen-parameters 'frame-parameters) (defalias 'screen-pixel-height 'frame-pixel-height) (defalias 'screen-pixel-width 'frame-pixel-width) (defalias 'screen-root-window 'frame-root-window) (defalias 'screen-selected-window 'frame-selected-window) (defalias 'lower-screen 'lower-frame) (defalias 'raise-screen 'raise-frame) (defalias 'screen-visible-p 'frame-visible-p) (defalias 'screenp 'framep) (defalias 'select-screen 'select-frame) (defalias 'selected-screen 'selected-frame) ;; (defalias 'set-screen-configuration 'set-frame-configuration) ;; (defalias 'set-screen-height 'set-frame-height) (defalias 'set-screen-position 'set-frame-position) (defalias 'set-screen-size 'set-frame-size) ;; (defalias 'set-screen-width 'set-frame-width) (defalias 'switch-to-buffer-new-screen 'switch-to-buffer-other-frame) ;; (defalias 'unfocus-screen 'unfocus-frame) (defalias 'visible-screen-list 'visible-frame-list) (defalias 'window-screen 'window-frame) (defalias 'x-create-screen 'x-create-frame) (defalias 'x-new-screen 'make-frame) (provide 'lucid) ;; arch-tag: 80f9ab46-0b36-4151-86ed-3edb6d449c9e ;;; lucid.el ends here