Commit graph

52 commits

Author SHA1 Message Date
Stefan Monnier
674728d4e3 * lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values.
(smie-precs->prec2): Rename from smie-precs-precedence-table.
(smie-bnf->prec2): Rename from smie-bnf-precedence-table.
(smie-prec2->grammar): Rename from smie-prec2-levels.
(smie-grammar): Rename from smie-op-levels.
(smie-indent--hanging-p): Rename from smie-hanging-p.
(smie-rule-hanging-p): New alias.
(smie-indent--bolp): Rename from smie-bolp.
(smie-indent--hanging-p): New alias.
(smie--token): New dynamically bound variable.
(smie-indent--parent): New function.
(smie-rule-parent-p): Use it; rename from smie-parent-p.
(smie-rule-next-p): Rename from smie-next-p.
(smie-rule-prev-p): Rename from smie-prev-p.
(smie-rule-sibling-p, smie-rule-parent)
(smie-indent--separator-outdent, smie-rule-separator): New functions.
(smie-rule-separator-outdent): New var.
(smie-indent--rule): Merge with smie-indent--column.
(smie-indent-forward-token, smie-indent-backward-token):
Also recognize close parens.
(smie-indent-keyword): Don't use smie-indent--column any more.
(smie-indent-after-keyword): Ignore closers by default.
(smie-indent-line): Use with-demoted-errors.
* lisp/progmodes/octave-mod.el (octave-smie-grammar):
Rename from octave-smie-op-levels.
(octave-smie-rules): Adjust to new behavior.
* lisp/progmodes/prolog.el (prolog-smie-grammar):
Rename from prolog-smie-op-levels.
2010-11-07 10:45:45 -05:00
Glenn Morris
5ed619e0a3 Use line-end-position rather than end-of-line, etc.
* textmodes/texnfo-upd.el (texinfo-start-menu-description)
(texinfo-update-menu-region-beginning, texinfo-menu-first-node)
(texinfo-delete-existing-pointers, texinfo-find-pointer)
(texinfo-clean-up-node-line, texinfo-insert-node-lines)
(texinfo-multiple-files-update):
* textmodes/table.el (table--probe-cell-left-up)
(table--probe-cell-right-bottom):
* textmodes/picture.el (picture-tab-search):
* textmodes/page-ext.el (pages-copy-header-and-position)
(pages-directory-for-addresses):
* progmodes/vera-mode.el (vera-get-offset):
* progmodes/simula.el (simula-calculate-indent):
* progmodes/python.el (python-pdbtrack-overlay-arrow):
* progmodes/prolog.el (end-of-prolog-clause):
* progmodes/perl-mode.el (perl-calculate-indent, perl-indent-exp):
* progmodes/icon.el (indent-icon-exp):
* progmodes/etags.el (tag-re-match-p):
* progmodes/ebrowse.el (ebrowse-show-file-name-at-point):
* progmodes/ebnf2ps.el (ebnf-begin-file):
* progmodes/dcl-mode.el (dcl-back-to-indentation-1)
(dcl-save-local-variable):
* play/life.el (life-setup):
* play/gametree.el (gametree-looking-at-ply):
* nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
* mail/sendmail.el (mail-mode-auto-fill):
* emacs-lisp/lisp-mode.el (calculate-lisp-indent):
* emacs-lisp/edebug.el (edebug-overlay-arrow):
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid):
* woman.el (woman-parse-numeric-value, woman2-TH, woman2-SH)
(woman-tab-to-tab-stop, WoMan-warn-ignored):
* type-break.el (type-break-file-keystroke-count):
* term.el (term-replace-by-expanded-history-before-point)
(term-skip-prompt, term-extract-string):
* speedbar.el (speedbar-edit-line, speedbar-expand-line)
(speedbar-contract-line, speedbar-toggle-line-expansion)
(speedbar-parse-c-or-c++tag, speedbar-parse-tex-string)
(speedbar-buffer-revert-buffer, speedbar-highlight-one-tag-line):
* sort.el (sort-skip-fields):
* skeleton.el (skeleton-internal-list):
* simple.el (line-move-finish, line-move-to-column):
* shell.el (shell-forward-command):
* misc.el (copy-from-above-command):
* makesum.el (double-column):
* ebuff-menu.el (electric-buffer-update-highlight):
* dired.el (dired-move-to-end-of-filename):
* dframe.el (dframe-popup-kludge):
* bookmark.el (bookmark-kill-line, bookmark-bmenu-show-filenames):
* arc-mode.el (archive-get-lineno):
Use line-end-position and line-beginning-position.

* net/ange-ftp.el, progmodes/hideif.el, reposition.el:
Same, but only in comments.
2010-11-06 13:23:42 -07:00
Stefan Monnier
c4d17d50ea SMIE: change indent rules format, improve smie-setup.
* lisp/emacs-lisp/smie.el (smie-precs-precedence-table)
(smie-merge-prec2s, smie-bnf-precedence-table, smie-prec2-levels):
Mark them pure so the tables gets built at compile time.
(smie-bnf-precedence-table): Store the closer-alist in the table.
(smie-prec2-levels): Preserve the closer-alist.
(smie-blink-matching-open): Be more forgiving in case of indentation.
(smie-hanging-p): Rename from smie-indent--hanging-p.
(smie-bolp): Rename from smie-indent--bolp.
(smie--parent, smie--after): New dynamic vars.
(smie-parent-p, smie-next-p, smie-prev-p): New funs.
(smie-indent-rules): Remove.
(smie-indent--offset-rule): Remove fun.
(smie-rules-function): New var.
(smie-indent--rule): New fun.
(smie-indent--offset, smie-indent-keyword, smie-indent-after-keyword)
(smie-indent-exps): Use it.
(smie-setup): Setup paren blinking; add keyword args for token
functions; extract closer-alist from op-levels.
(smie-indent-debug-log): Remove var.
(smie-indent-debug): Remove fun.
* lisp/progmodes/prolog.el (prolog-smie-indent-rules): Remove.
(prolog-smie-rules): New fun to replace it.
(prolog-mode-variables): Simplify.
* lisp/progmodes/octave-mod.el (octave-smie-closer-alist): Remove, now that
it's setup automatically.
(octave-smie-indent-rules): Remove.
(octave-smie-rules): New fun to replace it.
(octave-mode): Simplify.
2010-10-29 15:20:28 -04:00
Stefan Monnier
549d0e1ec4 * lisp/progmodes/prolog.el (prolog-smie-forward-token)
(prolog-smie-backward-token): New functions.
(prolog-mode-variables): Use them to parse "!," correctly.
Set up smie-blink-matching for ".".
* test/indent/prolog.prolog: Use normal spacing around !.
2010-09-20 16:22:16 +02:00
Stefan Monnier
9acd1bdcb9 * lisp/progmodes/prolog.el (smie): Require. 2010-08-18 13:01:15 +02:00
Juanma Barranquero
5d8fe0ba81 * progmodes/prolog.el (smie-indent-basic): Declare for byte-compiler. 2010-05-18 09:52:10 +02:00
Stefan Monnier
5ad4bef575 Provide a simple generic indentation engine and use it for Prolog.
* emacs-lisp/smie.el: New file.
* progmodes/prolog.el (prolog-smie-op-levels)
(prolog-smie-indent-rules): New var.
(prolog-mode-variables): Use them to configure SMIE.
(prolog-indent-line, prolog-indent-level): Remove.
2010-05-17 15:27:26 -04:00
Stefan Monnier
13973643c9 * progmodes/prolog.el (prolog-mode): Use define-derived-mode. 2010-05-15 00:08:03 -04:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Glenn Morris
a569b48010 (compilation-error-regexp-alist, compilation-forget-errors): Declare. 2009-08-22 19:21:18 +00:00
Stefan Monnier
28930e394d (inferior-prolog-error-regexp-alist): New var.
(inferior-prolog-mode): Use it.
(inferior-prolog-load-file): Reset list of errors.
2009-08-19 17:15:30 +00:00
Glenn Morris
1ba983e8d9 Replace last-command-char with last-command-event. 2009-01-09 04:23:38 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Glenn Morris
b1fc2b5014 Switch to recommended form of GPLv3 permissions notice. 2008-05-06 07:25:26 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
4e643dd23c Add 2008 to copyright years. 2008-01-07 02:11:00 +00:00
Glenn Morris
5cec305694 Remove directory part from filenames in function declarations. 2007-12-06 04:09:57 +00:00
Dan Nicolaescu
153ef845b8 * progmodes/idlw-help.el: Require browse-url unconditionally, it
is available by default.
(idlwave-help-browse-url-available): Change default to t.

* emulation/edt.el (defgroup, defcustom): Remove definition.
(eval-when-compile): Remove.
(c-mark-function):
* textmodes/reftex-dcr.el (bibtex-beginning-of-entry):
* textmodes/fill.el (comment-search-forward)
(comment-string-strip):
* progmodes/prolog.el (comint-mode, comint-send-string)
(comint-send-region, comint-send-eof):
* progmodes/dcl-mode.el (imenu-default-create-index-function):
* emulation/viper-util.el (viper-forward-Word):
* emulation/vi.el (c-mark-function):
* emulation/edt-vt100.el (vt100-wide-mode):
* emacs-lisp/timer.el (diary-entry-time): Declare as functions.

* url-mailto.el (mail-send-and-exit):
* url-http.el (url-dav-file-attributes):
* url-file.el (ange-ftp-set-passwd, ange-ftp-copy-file-internal):
Declare as functions.

* url-privacy.el (url-device-type): Define unconditionally.
2007-11-20 00:57:10 +00:00
Dan Nicolaescu
3cd79f623b * progmodes/prolog.el: Undo previous change.
(comint-prompt-regexp, comint-process-echoes): Pacify
byte-compiler.

* progmodes/dcl-mode.el:
* play/yow.el:
* calendar/todo-mode.el:
* calendar/cal-hebrew.el:
* vc-hg.el: Undo previous change.

* vms-patch.el: Likewise.
(print-region-function): Pacify byte-compiler.
2007-10-21 14:54:34 +00:00
Dan Nicolaescu
7caf6803d5 * textmodes/two-column.el (2C-split, 2C-merge):
* textmodes/bib-mode.el (bib-find-key, mark-bib):
* progmodes/idlw-shell.el (idlwave-shell-move-or-history):
* progmodes/etags.el (find-tag-in-order, etags-tags-apropos)
* progmodes/ada-xref.el (ada-get-all-references):
* obsolete/mlsupport.el (ml-next-line, ml-previous-line):
* emulation/vi.el (vi-previous-line-first-nonwhite)
(vi-effective-range, vi-put-before):
* emulation/edt.el (edt-next-line, edt-previous-line)
(edt-paragraph-forward): Use forward-line.

* progmodes/etags.el (tags-apropos): Require apropos at compile
time too.

* progmodes/prolog.el: Require comint when compiling.
(inferior-prolog-flavor): Move defvar before use.
2007-10-19 18:41:09 +00:00
Glenn Morris
1a484753b2 Switch license to GPLv3 or later. 2007-07-25 04:29:40 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Stefan Monnier
23f2d048b5 (inferior-prolog-flavor): New var left out of previous commit.
(inferior-prolog-guess-flavor): New fun left out of previous commit.
(prolog-consult-region-and-go): Don't hard code "*prolog*" and don't
burp in dedicated windows.
(inferior-prolog-self-insert-command): New command.
(inferior-prolog-mode-map): Use it.
2006-09-07 16:18:06 +00:00
Stefan Monnier
d364dee6ba Remove * in docstrings.
(prolog-program-name): Add SWI prolog.
(prolog-mode-menu): New menu.
(prolog-mode): Set comment-add.
(prolog-indent-line): Simplify.  Use indent-line-to.
(inferior-prolog-buffer): New var.
(inferior-prolog-run, inferior-prolog-process): New funs.
(run-prolog, switch-to-prolog): Rewrite, using them.
(prolog-consult-region): Use inferior-prolog-buffer.
(inferior-prolog-load-file): New function.
(prolog-mode-map): Add bindings for load-file and switch-to-prolog.
2006-09-06 17:34:12 +00:00
Nick Roberts
d91362c9e0 Update copyright for 2006. 2006-02-10 09:00:31 +00:00
Juri Linkov
8ec3bce045 Add :link (custom-group-link font-lock-faces) to defgroup. 2005-11-17 07:40:11 +00:00
Juanma Barranquero
4e186ad5f3 (comint-prompt-regexp): Add defvar. 2005-08-30 11:12:14 +00:00
Nick Roberts
034babe1e1 Update copyright for release of 22.1 for progmodes directory. 2005-08-01 08:43:45 +00:00
Lute Kamstra
3a35cf56e7 Update FSF's address. 2005-07-04 17:55:18 +00:00
Juanma Barranquero
c6c5714e40 (prolog-eof-string): Doc fixes.
(prolog-indent-level): Fix typo in docstring.
2005-07-04 09:42:58 +00:00
Juanma Barranquero
73efac4955 (prolog): Finish `defgroup' description with period. 2005-07-04 03:18:35 +00:00
Juanma Barranquero
c647adda60 Replace send-string' by process-send-string'; replace send-region' by process-send-region'. 2005-05-18 10:19:31 +00:00
Juri Linkov
d8059b0331 (prolog-mode-variables): Fix imenu-generic-expression. 2004-12-01 19:48:52 +00:00
Stefan Monnier
6cfd4f3ad9 (prolog-program-name): Use gprolog if available.
(prolog-mode-syntax-table, prolog-mode-abbrev-table, prolog-mode-map):
Bring together declaration and initialization.
(prolog-mode-variables): Don't set the syntax table.
Don't set paragraph-start and comment-indent-function.
Add /*..*/ to the comment regexps.
(prolog-mode-commands): Remove.  Do it during init of prolog-mode-map.
(prolog-mode-map): Don't bind TAB.
(prolog-mode): Set the syntax table.
(prolog-comment-indent): Remove.
(inferior-prolog-mode-map): Initialize in the declaration.
(inferior-prolog-mode-syntax-table)
(inferior-prolog-mode-abbrev-table): New vars.
(inferior-prolog-mode): Derive from comint-mode.
(run-prolog): Avoid switch-to-buffer which can fail in dedicated and
minibuffer windows.
2004-02-08 23:37:11 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Thien-Thi Nguyen
f614a1aec2 (prolog-mode-syntax-table): Add flags to ?/ and ?* entries
to support /* */ style comments.
(prolog-font-lock-keywords): New var.
(prolog-mode): Enable font-locking; set `font-lock-defaults'.
2002-06-01 00:55:41 +00:00
Karl Heuer
2c239c8061 (prolog-mode-variables):
Set imenu-generic-expression.
1997-12-04 04:28:41 +00:00
Richard M. Stallman
896546cd9b Add provide call. 1997-06-22 18:57:55 +00:00
Richard M. Stallman
0acdb86326 Comment change. 1997-05-27 19:51:23 +00:00
Richard M. Stallman
c5292bc831 Add defgroup's; use defcustom for user vars. 1997-04-12 08:35:41 +00:00
Erik Naggum
b578f267af Update FSF's address. 1996-01-14 07:34:30 +00:00
Boris Goldowsky
564148946e (prolog-mode-variables): Remove ^ from paragraph-start & paragraph-separate. 1995-03-02 15:38:25 +00:00
Richard M. Stallman
673f4fc6c4 (prolog-mode-syntax-table): Make newline end comments. 1994-07-12 03:10:30 +00:00
Eric S. Raymond
edbd2f74bc Added or corrected Commentary sections 1993-03-22 05:42:35 +00:00
Eric S. Raymond
e41b2db1da Added or corrected Commentary sections 1993-03-22 03:27:18 +00:00
Eric S. Raymond
9750e079dd entered into RCS 1992-07-22 04:22:30 +00:00
Eric S. Raymond
d7b4d18fd4 *** empty log message *** 1992-07-17 20:24:00 +00:00
Eric S. Raymond
e516799970 *** empty log message *** 1992-07-16 21:47:34 +00:00
Eric S. Raymond
6594deb0dc *** empty log message *** 1992-05-30 22:12:04 +00:00
Jim Blandy
f9f9507e1d *** empty log message *** 1991-05-09 21:50:55 +00:00