mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-03 11:33:37 +00:00
79d585c2be
Use lexical-binding in all the lisp/obsolete/*.el files. While at it, removed redundant :group arguments and used #' to quote functions. Commented out the key bindings which the #' revealed to lead to non-existing commands, and replaced those revealed to be obsolete. * lisp/obsolete/cl-compat.el: Use cl-lib. * lisp/obsolete/cust-print.el: Assume `defalias` exists. (with-custom-print): Use `declare`. * lisp/obsolete/iswitchb.el (iswitchb-init-XEmacs-trick) (iswitchb-xemacs-backspacekey): Remove functions. * lisp/obsolete/landmark.el (landmark, landmark-nslify-wts): Prefer `apply` to `eval`. * lisp/obsolete/longlines.el (longlines-mode): Don't use `add-to-list` on a hook. * lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region): Use `clear-string`. * lisp/obsolete/pgg-pgp.el (pgg-pgp-encrypt-region): Remove oddly unused var `passphrase`. (pgg-pgp-verify-region): Declare var `jam-zcat-filename-list`. * lisp/obsolete/pgg-pgp5.el (pgg-pgp5-encrypt-region): Remove oddly unused var `passphrase`. (pgg-pgp5-verify-region): Declare var `jam-zcat-filename-list`. * lisp/obsolete/pgg.el: Remove some XEmacs compatibility code. (pgg-run-at-time, pgg-cancel-timer, pgg-clear-string): Remove functions. Use their core equivalent instead. * lisp/obsolete/rcompile.el (remote-compile): Remove unused vars `l`, `l-host`, `l-user`, and `localname`. * lisp/obsolete/starttls.el (starttls-any-program-available): Use `define-obsolete-function-alias`. * lisp/obsolete/tls.el (tls-format-message): Delete function, use `format-message` instead. * lisp/obsolete/url-ns.el (url-ns-prefs): Use `with-current-buffer` and `dlet`. * lisp/obsolete/vip.el (vip-escape-to-emacs): Remove unused var `key`. (vip-command-argument, vip-read-string, ex-delete, ex-line): Remove unused var `conditions`. (ex-map): Use a closure instead of `eval`. (ex-set): Make it an alias of `set-variable`. (ex-substitute): Remove unused var `cont`. * lisp/obsolete/abbrevlist.el: * lisp/obsolete/bruce.el: * lisp/obsolete/cc-compat.el: * lisp/obsolete/cl-compat.el: * lisp/obsolete/cl.el: * lisp/obsolete/complete.el: * lisp/obsolete/crisp.el: * lisp/obsolete/cust-print.el: * lisp/obsolete/erc-compat.el: * lisp/obsolete/erc-hecomplete.el: * lisp/obsolete/eudcb-ph.el: * lisp/obsolete/fast-lock.el: * lisp/obsolete/gs.el: * lisp/obsolete/gulp.el: * lisp/obsolete/html2text.el: * lisp/obsolete/info-edit.el: * lisp/obsolete/iswitchb.el: * lisp/obsolete/landmark.el: * lisp/obsolete/lazy-lock.el: * lisp/obsolete/longlines.el: * lisp/obsolete/mailpost.el: * lisp/obsolete/mantemp.el: * lisp/obsolete/meese.el: * lisp/obsolete/messcompat.el: * lisp/obsolete/metamail.el: * lisp/obsolete/mouse-sel.el: * lisp/obsolete/nnir.el: * lisp/obsolete/old-emacs-lock.el: * lisp/obsolete/otodo-mode.el: * lisp/obsolete/patcomp.el: * lisp/obsolete/pc-mode.el: * lisp/obsolete/pc-select.el: * lisp/obsolete/pgg-def.el: * lisp/obsolete/pgg-gpg.el: * lisp/obsolete/pgg-parse.el: * lisp/obsolete/pgg-pgp.el: * lisp/obsolete/pgg-pgp5.el: * lisp/obsolete/pgg.el: * lisp/obsolete/rcompile.el: * lisp/obsolete/s-region.el: * lisp/obsolete/sb-image.el: * lisp/obsolete/sregex.el: * lisp/obsolete/starttls.el: * lisp/obsolete/sup-mouse.el: * lisp/obsolete/terminal.el: * lisp/obsolete/tls.el: * lisp/obsolete/tpu-edt.el: * lisp/obsolete/tpu-extras.el: * lisp/obsolete/tpu-mapper.el: * lisp/obsolete/url-ns.el: * lisp/obsolete/vc-arch.el: * lisp/obsolete/vi.el: * lisp/obsolete/vip.el: * lisp/obsolete/ws-mode.el: * lisp/obsolete/yow.el: Use lexical-binding.
166 lines
5.6 KiB
EmacsLisp
166 lines
5.6 KiB
EmacsLisp
;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion -*- lexical-binding: t; -*-
|
||
|
||
;; Copyright (C) 1985, 1987, 1992-2021 Free Software Foundation, Inc.
|
||
|
||
;; Authors: 1998- Martin Stjernholm
|
||
;; 1994-1999 Barry A. Warsaw
|
||
;; Maintainer: bug-cc-mode@gnu.org
|
||
;; Created: August 1994, split from cc-mode.el
|
||
;; Keywords: c languages
|
||
;; Package: cc-mode
|
||
;; Obsolete-Since: 24.5
|
||
|
||
;; 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 <https://www.gnu.org/licenses/>.
|
||
|
||
;;; Commentary:
|
||
;;
|
||
;; Boring old c-mode.el (BOCM) is confusion and brain melt. cc-mode.el
|
||
;; is clarity of thought and purity of chi. If you are still unwilling
|
||
;; to accept enlightenment, this might help, or it may prolong your
|
||
;; agony.
|
||
;;
|
||
;; To use, add the following to your c-mode-hook:
|
||
;;
|
||
;; (require 'cc-compat)
|
||
;; (c-set-style "BOCM")
|
||
;;
|
||
;; This file is completely unsupported! Although it has been patched
|
||
;; superficially to keep pace with the rest of CC Mode, it hasn't been
|
||
;; tested for a long time.
|
||
|
||
;;; Code:
|
||
|
||
(eval-when-compile
|
||
(let ((load-path
|
||
(if (and (boundp 'byte-compile-dest-file)
|
||
(stringp byte-compile-dest-file))
|
||
(cons (file-name-directory byte-compile-dest-file) load-path)
|
||
load-path)))
|
||
(load "cc-bytecomp" nil t)))
|
||
|
||
(cc-require 'cc-defs)
|
||
(cc-require 'cc-vars)
|
||
(cc-require 'cc-styles)
|
||
(cc-require 'cc-engine)
|
||
|
||
|
||
;; In case c-mode.el isn't loaded
|
||
(defvar c-indent-level 2
|
||
"Indentation of C statements with respect to containing block.")
|
||
;;;###autoload(put 'c-indent-level 'safe-local-variable 'integerp)
|
||
|
||
(defvar c-brace-imaginary-offset 0
|
||
"Imagined indentation of a C open brace that actually follows a statement.")
|
||
(defvar c-brace-offset 0
|
||
"Extra indentation for braces, compared with other text in same context.")
|
||
(defvar c-argdecl-indent 5
|
||
"Indentation level of declarations of C function arguments.")
|
||
(defvar c-label-offset -2
|
||
"Offset of C label lines and case statements relative to usual indentation.")
|
||
(defvar c-continued-statement-offset 2
|
||
"Extra indent for lines not starting new statements.")
|
||
(defvar c-continued-brace-offset 0
|
||
"Extra indent for substatements that start with open-braces.
|
||
This is in addition to c-continued-statement-offset.")
|
||
|
||
|
||
|
||
;; these offsets are taken by brute force testing c-mode.el, since
|
||
;; there's no logic to what it does.
|
||
(let* ((offsets '(c-offsets-alist .
|
||
((defun-block-intro . cc-block-intro-offset)
|
||
(statement-block-intro . cc-block-intro-offset)
|
||
(defun-open . 0)
|
||
(class-open . 0)
|
||
(inline-open . c-brace-offset)
|
||
(block-open . c-brace-offset)
|
||
(block-close . cc-block-close-offset)
|
||
(brace-list-open . c-brace-offset)
|
||
(substatement-open . cc-substatement-open-offset)
|
||
(substatement . c-continued-statement-offset)
|
||
(knr-argdecl-intro . c-argdecl-indent)
|
||
(case-label . c-label-offset)
|
||
(access-label . c-label-offset)
|
||
(label . c-label-offset)
|
||
))))
|
||
(c-add-style "BOCM" offsets))
|
||
|
||
|
||
(defun cc-block-intro-offset (langelem)
|
||
;; taken directly from calculate-c-indent confusion
|
||
(save-excursion
|
||
(c-backward-syntactic-ws)
|
||
(if (eq (char-before) ?{)
|
||
(forward-char -1)
|
||
(goto-char (cdr langelem)))
|
||
(let* ((curcol (save-excursion
|
||
(goto-char (cdr langelem))
|
||
(current-column)))
|
||
(bocm-lossage
|
||
;; If no previous statement, indent it relative to line
|
||
;; brace is on. For open brace in column zero, don't let
|
||
;; statement start there too. If c-indent-level is zero,
|
||
;; use c-brace-offset + c-continued-statement-offset
|
||
;; instead. For open-braces not the first thing in a line,
|
||
;; add in c-brace-imaginary-offset.
|
||
(+ (if (and (bolp) (zerop c-indent-level))
|
||
(+ c-brace-offset c-continued-statement-offset)
|
||
c-indent-level)
|
||
;; Move back over whitespace before the openbrace. If
|
||
;; openbrace is not first nonwhite thing on the line,
|
||
;; add the c-brace-imaginary-offset.
|
||
(progn (skip-chars-backward " \t")
|
||
(if (bolp) 0 c-brace-imaginary-offset))
|
||
;; If the openbrace is preceded by a parenthesized exp,
|
||
;; move to the beginning of that; possibly a different
|
||
;; line
|
||
(progn
|
||
(if (eq (char-before) ?\))
|
||
(c-forward-sexp -1))
|
||
;; Get initial indentation of the line we are on.
|
||
(current-indentation)))))
|
||
(- bocm-lossage curcol))))
|
||
|
||
|
||
(defun cc-block-close-offset (langelem)
|
||
(save-excursion
|
||
(let* ((here (point))
|
||
bracep
|
||
(curcol (progn
|
||
(goto-char (cdr langelem))
|
||
(current-column)))
|
||
(bocm-lossage (progn
|
||
(goto-char (cdr langelem))
|
||
(if (eq (char-after) ?{)
|
||
(setq bracep t)
|
||
(goto-char here)
|
||
(beginning-of-line)
|
||
(backward-up-list 1)
|
||
(forward-char 1)
|
||
(c-forward-syntactic-ws))
|
||
(current-column))))
|
||
(- bocm-lossage curcol
|
||
(if bracep 0 c-indent-level)))))
|
||
|
||
|
||
(defun cc-substatement-open-offset (_langelem)
|
||
(+ c-continued-statement-offset c-continued-brace-offset))
|
||
|
||
|
||
(cc-provide 'cc-compat)
|
||
|
||
;;; cc-compat.el ends here
|