procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
122265 commits 1 branch 0 tags 944 MiB
Commit graph

385 commits

Author SHA1 Message Date
Stefan Monnier
06193432f2 * lisp/progmodes/sh-script.el: Better handle nested quotes 
(sh-here-doc-open-re): Don't mis-match the <<< operator (bug#20683).
(sh-font-lock-quoted-subshell): Make sure double quotes within single
quotes don't mistakenly end prematurely the surrounding string.
 2015-06-09 22:10:38 -04:00
Paul Eggert
dfc2ef11a8 Fix minor quoting problems in doc strings 
Most of these fixes involve escaping grave accents that are
actually intended to be grave accents, not left quotes.
(Bug#20385)
 2015-05-28 00:22:03 -07:00
Stefan Monnier
c9a75a4030 Fix byte-compiler warnings about looking-back. 
* lisp/vc/log-view.el (log-view-end-of-defun-1):
* lisp/textmodes/tex-mode.el (latex-forward-sexp-1):
* lisp/textmodes/reftex-ref.el (reftex-goto-label):
* lisp/textmodes/bibtex.el (bibtex-insert-kill):
* lisp/progmodes/sh-script.el (sh--maybe-here-document):
* lisp/progmodes/ruby-mode.el (ruby-end-of-defun):
* lisp/progmodes/ada-mode.el (ada-in-numeric-literal-p):
* lisp/org/org.el (org-insert-heading, org-sort-entries):
* lisp/org/org-mouse.el (org-mouse-end-headline)
(org-mouse-context-menu):
* lisp/org/org-clock.el (org-clock-cancel):
* lisp/man.el (Man-default-man-entry):
* lisp/mail/rmail.el (rmail-get-new-mail, rmail-insert-inbox-text)
(rmail-ensure-blank-line):
* lisp/mail/footnote.el (Footnote-delete-footnote):
* lisp/mail/emacsbug.el (report-emacs-bug):
* lisp/info.el (Info-follow-reference, Info-fontify-node):
* lisp/info-look.el (info-lookup-guess-custom-symbol):
* lisp/help-fns.el (help-fns--key-bindings):
* lisp/files.el (hack-local-variables):
* lisp/emulation/viper-ex.el (viper-get-ex-token, ex-cmd-complete)
(viper-get-ex-pat, ex-expand-filsyms, viper-get-ex-file)
(viper-complete-filename-or-exit):
* lisp/emulation/viper-cmd.el (viper-backward-indent):
* lisp/emacs-lisp/lisp-mode.el (calculate-lisp-indent):
* lisp/emacs-lisp/elint.el (elint-get-top-forms):
* lisp/cus-edit.el (custom-face-edit-value-create):
* lisp/calendar/todo-mode.el (todo-set-item-priority)
(todo-filter-items-1, todo-convert-legacy-files)
(todo-prefix-overlays): Add explicit second arg to looking-back.
 2015-04-20 21:55:00 -04:00
Fabián Ezequiel Gallina
e57f766d3c Merge from origin/emacs-24 
2a57b7e Fixes: debbugs:18756

Conflicts:
	lisp/ChangeLog
 2015-01-28 01:03:22 -03:00
Glenn Morris
2a57b7e5b4 Fixes: debbugs:18756 
sh-basic-indent-line fix

* lisp/progmodes/sh-script.el (sh-mode): Doc fix.
(sh-basic-indent-line): Handle electric newline.
 2015-01-06 13:52:15 -05:00
Paul Eggert
7e09ef09a4 Update copyright year to 2015 
Run admin/update-copyright.
 2015-01-01 14:26:41 -08:00
Paul Eggert
732fd4c7e1 Update copyright year to 2015 
Run admin/update-copyright.
 2015-01-01 09:18:06 -08:00
Fabián Ezequiel Gallina
411c1c6531 Merge from origin/emacs-24 
216c6aa * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust.
20cfd24 Improve indexing on the chapter/section/subsection levels.
14c3739 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided.
ea78112 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" as end-of-line delimeter for passwords, when running on MS Windows.
012479a * lisp/progmodes/sh-script.el: Don't set global indent-line-function
75e114f Fix line numbers on Python shell.
d0fd23c doc/emacs/buffers.texi (Kill Buffer): Improve indexing.
8e818d1 Keep maximized when going fullscreen.
749813e python.el: Fix electric colon behavior
936d5e5 Fix last patch.
74d3b20 Fixes: debbugs:18623

Conflicts:
	doc/emacs/ChangeLog
	doc/lispref/ChangeLog
	doc/lispref/functions.texi
	lisp/ChangeLog
	src/ChangeLog
	src/xterm.c
	test/ChangeLog
 2014-12-27 13:21:17 -03:00
Stefan Monnier
012479a7a6 * lisp/progmodes/sh-script.el: Don't set global indent-line-function 
Fixes: debbugs:19433

(sh-set-shell): Don't change the global value of indent-line-function.
 2014-12-22 23:22:20 -05:00
Stefan Monnier
4fda400e58 Merge from emacs-24 2014-12-05 15:30:09 -05:00
Stefan Monnier
e3c24b171b * lisp/progmodes/sh-script.el: Fix indentation rule of "| while". 
Fixes: debbugs:18031

* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Go back to the beginning
of the whole pipe when indenting an opening keyword after a |.
Generalize this treatment to opening keywords like "while".
 2014-12-04 10:09:08 -05:00
Stefan Monnier
e6769f1890 * lisp/progmodes/sh-script.el (sh-font-lock-quoted-subshell): Try to better 
handle multiline elements.

Fixes: debbugs:18380
 2014-09-02 20:38:49 -04:00
Stefan Monnier
bb16bffbd2 Indentation, punctuation, and other nitpicks. 2014-07-20 21:41:59 -04:00
Glenn Morris
5613a6f6d5 Merge from emacs-24; up to 2014-06-19T14:03:45Z!monnier@iro.umontreal.ca 2014-07-08 19:04:12 -07:00
Stefan Monnier
d8899d09b9 * lisp/progmodes/sh-script.el (sh-smie-sh-rules): Don't align with a && in 
the middle of a line.

Fixes: debbugs:17896
 2014-07-08 14:38:07 -04:00
Glenn Morris
9ac6d28ab8 Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org 2014-06-25 23:55:15 -07:00
Stefan Monnier
370ceb2210 Fix some indentation problem with \; and pipes. 
* lisp/progmodes/sh-script.el (sh-mode-syntax-table): Set syntax of ;|&.
(sh-smie--default-forward-token, sh-smie--default-backward-token):
New functions.
(sh-smie-sh-forward-token, sh-smie-sh-backward-token)
(sh-smie-rc-forward-token, sh-smie-rc-backward-token): Use them.
(sh-smie-sh-rules): Fix indentation of a pipe at BOL.

Fixes: debbugs:17842
 2014-06-24 16:16:10 -04:00
Glenn Morris
c400516ab1 Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca 2014-06-21 12:45:59 -07:00
Stefan Monnier
9e248ebdc7 * lisp/progmodes/sh-script.el (sh-smie-sh-rules): For { after &&, don't 
align with the surrounding parent.

Fixes: debbugs:17721
 2014-06-20 10:23:30 -04:00
Stefan Monnier
500dce5f4d * lisp/emacs-lisp/smie.el (smie--hanging-eolp-function): New var. 
(smie-indent--hanging-p): Use it.
* lisp/progmodes/sh-script.el (sh-set-shell): Set it.

Fixes: debbugs:17621
 2014-06-19 21:05:40 -04:00
Stefan Monnier
e9638b49e5 * lisp/progmodes/sh-script.el (sh-smie-sh-rules): Use same rule for && as 
for |.

Fixes: debbugs:17621
 2014-06-19 18:52:12 -04:00
Stefan Monnier
6711a21f11 * lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions. 
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it.  Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
 2014-05-28 23:45:29 -04:00
Daniel Colascione
708374c7bc File-local-variable support for sh-script; add mksh support 
* lisp/files.el (interpreter-mode-alist): Add mksh.

* lisp/progmodes/sh-script.el (sh-ancestor-alist): Add mksh, a pdksh
derivative.
(sh-alias-alist): Alias /system/bin/sh (Android's system shell) to
mksh. Improve custom spec; allow regular expressions.
(sh-shell): Delegate name splitting to `sh-canonicalize-shell'.
(sh-after-hack-local-variables): New function.
(sh-mode): Use it; respect file-local `sh-shell' variable.
(sh-set-shell): Use `sh-canonicalize-shell' instead of open-coding
the normalization.
(sh-canonicalize-shell): Rewrite to support regexes.

Fixes: debbugs:17333
 2014-05-20 18:54:33 -07:00
Paul Eggert
3e9fa60a5c Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert@cs.ucla.edu 2014-05-04 12:37:56 -07:00
Glenn Morris
d136f18462 Doc fixes 
* doc/misc/autotype.texi (Skeleton Language):
* doc/misc/message.texi (Header Commands):
* lisp/allout-widgets.el (allout-widgets-tally)
(allout-decorate-item-guides):
* lisp/menu-bar.el (menu-bar-positive-p):
* lisp/minibuffer.el (completion-pcm-complete-word-inserts-delimiters):
* lisp/cedet/ede.el (ede-project-directories, ede-check-project-directory):
* lisp/cedet/semantic/ia-sb.el (semantic-ia-sb-show-doc):
* lisp/cedet/semantic/tag.el (semantic-tag-in-buffer-p):
* lisp/cedet/semantic/bovine/c.el (semantic-tag-abstract-p):
* lisp/gnus/gnus-registry.el (gnus-registry-install-p): Doc fix.
* lisp/progmodes/gdb-mi.el (gdbmi-same-start, gdbmi-is-number):
* lisp/progmodes/js.el (js--inside-param-list-p)
(js--inside-dojo-class-list-p, js--forward-destructuring-spec):
* lisp/progmodes/prolog.el (region-exists-p):
* lisp/progmodes/verilog-mode.el (verilog-scan-cache-ok-p):
* lisp/textmodes/reftex-parse.el (reftex-using-biblatex-p):
* lisp/url/url-parse.el (url-generic-parse-url):
* src/floatfns.c (Fisnan):
* src/profiler.c (Fprofiler_cpu_running_p):
Doc fixes (replace `iff').

Fixes: debbugs:17309
 2014-05-01 19:55:25 -04:00
Daniel Colascione
9b233997f4 Add coproc to list of bash builtins. 
* lisp/progmodes/sh-script.el (sh-builtins): Add coproc to list of bash builtins.
 2014-04-23 19:37:02 -07:00
Stefan Monnier
fe36068f12 * lisp/progmodes/sh-script.el (sh-smie--sh-keyword-p): Handle variable 
assignments such as "case=hello".

Fixes: debbugs:17297
 2014-04-19 13:14:27 -04:00
Glenn Morris
2a55bc7ab5 * lisp/progmodes/sh-script.el: Fix whitespace in previous change. 2014-03-05 14:02:55 -05:00
Glenn Morris
bd2d43dc74 Recognize dash shell 
* lisp/files.el (interpreter-mode-alist):
* lisp/progmodes/sh-script.el (sh-ancestor-alist): Add dash.

Fixes: debbugs:16938
 2014-03-05 13:58:16 -05:00
Glenn Morris
34dc21db6e Replace "Maintainer: FSF" with the emacs-devel mailing address 2014-02-09 17:34:22 -08:00
Daniel Colascione
00d2a6bb26 Fix here-doc highlighting 2014-01-21 15:42:59 -08:00
Paul Eggert
4fa5174182 Spelling fixes. 
* lisp/emacs-lisp/generic.el (generic--normalize-comments):
Rename from generic--normalise-comments.  All uses changed.
* lisp/play/bubbles.el (bubbles--neighborhood-score):
(bubbles--mark-direct-neighbors, bubbles--mark-neighborhood)
(bubbles--neighborhood-available)
(bubbles--update-neighborhood-score):
Rename from names with 'neighbourhood'.  All uses changed.
 2014-01-11 21:29:11 -08:00
Paul Eggert
ba3189039a Update copyright year to 2014 by running admin/update-copyright. 2014-01-01 07:43:34 +00:00
Daniel Colascione
e63ace374c Fix infloop in indentation code 2013-12-30 15:16:34 -08:00
Daniel Colascione
3282bd2ea5 * progmodes/sh-script.el (sh-mode): Tweak paragraph-separate 
so that we don't reflow comments into the shebang line.
 2013-12-20 13:41:57 -08:00
Leo Liu
0518b057fe * subr.el (process-live-p): Return nil for non-process. 
* progmodes/sh-script.el (sh-shell-process):
* progmodes/octave.el (inferior-octave-process-live-p):
* progmodes/gdb-mi.el (gdb-delchar-or-quit)
(gdb-inferior-io-sentinel):
* emacs-lock.el (emacs-lock-live-process-p): All uses changed.

Fixes: debbugs:16023
 2013-12-02 15:13:01 +08:00
Andreas Schwab
c9df215b41 * progmodes/sh-script.el (sh-font-lock-keywords-var): Force 
highlighting text after Summary keyword in doc face for rpm.
 2013-11-09 11:49:42 +01:00
Stefan Monnier
43668fb196 * lisp/progmodes/sh-script.el (sh-smie--sh-keyword-in-p): Don't inf-loop 
at bobp.
(sh-smie--sh-keyword-in-p): Recognize keywords at bobp.

Fixes: debbugs:15826
 2013-11-07 23:33:32 -05:00
Stefan Monnier
71e3276bc5 * lisp/emacs-lisp/smie.el: New smie-config system. 
(smie-config): New defcustom.
(smie-edebug, smie-config-show-indent, smie-config-set-indent)
(smie-config-guess, smie-config-save): New commands.
(smie-config--mode-local, smie-config--buffer-local)
(smie-config--trace, smie-config--modefuns): New vars.
(smie-config--advice, smie-config--mode-hook)
(smie-config--setter, smie-config-local, smie-config--get-trace)
(smie-config--guess-value, smie-config--guess): New functions.
(smie-indent-forward-token, smie-indent-backward-token): Don't copy
text properties.  Treat "string fence" syntax like string syntax.

* lisp/progmodes/sh-script.el (sh-use-smie): Change default.
(sh-smie-sh-rules, sh-smie-rc-rules): Obey legacy sh-indent-* vars.
(sh-var-value): Simplify by CSE.
(sh-show-indent, sh-set-indent, sh-learn-line-indent)
(sh-learn-buffer-indent): Redirect to their SMIE equivalent when SMIE
is used.
(sh-guess-basic-offset): Use cl-incf.
(sh-guess-basic-offset): Use push+nreverse to avoid O(n^2).
 2013-10-24 17:16:20 -04:00
Stefan Monnier
85527ff309 * lisp/progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's 
forward-sexp-function while we redo its job.

Fixes: debbugs:15613
 2013-10-16 23:56:51 -04:00
Glenn Morris
a5d38e349a * lisp/progmodes/sh-script.el (sh-mark-line, sh-learn-buffer-indent): 
Occur buffers are read-only.  http://bugs.debian.org/720775
 2013-10-13 16:21:56 -07:00
Stefan Monnier
dd07001983 * lisp/progmodes/sh-script.el: Provide simpl(e|istic) completion. 
(explicit-shell-file-name): Declare.
(sh--vars-before-point, sh--cmd-completion-table): New functions.
(sh-completion-at-point-function): New function.
(sh-mode): Use it.
(sh-smie--keyword-p): Remove unused argument.
(sh-smie-sh-backward-token, sh-smie-rc-backward-token): Remove unused
vars.
(sh-set-shell): Always setup SMIE, even if we use the
old indentation code.
 2013-10-10 23:28:31 -04:00
Glenn Morris
1af4c2203c Treat interpreter-mode-alist as alist of regexps, not literals 
Cf http://lists.gnu.org/archive/html/emacs-devel/2005-08/msg00472.html

* lisp/files.el (interpreter-mode-alist): Convert to regexps.
(set-auto-mode): Adapt for this. 

* lisp/progmodes/cperl-mode.el (cperl-clobber-mode-lists):
Comment out unused variable.

* lisp/progmodes/cc-mode.el (interpreter-mode-alist):
* lisp/progmodes/python.el (interpreter-mode-alist):
* lisp/progmodes/ruby-mode.el (interpreter-mode-alist): Convert to regexps.

* lisp/progmodes/sh-script.el (sh-set-shell):
No longer use interpreter-mode-alist to get list of shells.

* etc/NEWS: Mention this.

Fixes: debbugs:15306
 2013-09-10 16:38:52 -04:00
Glenn Morris
cc585c965a * lisp/progmodes/sh-script.el (sh-builtins) <bash>: Add some bash4-isms. 2013-08-28 21:02:46 -04:00
Sam Steingold
6e50e9836a Add rudimentary inferior shell interaction 
* lisp/progmodes/sh-script.el (sh-shell-process): New buffer-local variable.
(sh-set-shell): Reset it.
(sh-show-shell, sh-cd-here, sh-send-line-or-region-and-step): New
commands (bound to C-c C-z, C-c C-d, and C-c C-n).
 2013-08-20 21:16:27 -04:00
Glenn Morris
f0398ec17f Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at 2013-07-20 12:20:33 -07:00
Andreas Schwab
f7a0389779 Fixes: debbugs:14826 
* progmodes/sh-script.el (sh-read-variable): Remove interactive
spec.
 2013-07-08 20:49:53 +02:00
Masatake YAMATO
4d3268ba39 * lisp/progmodes/sh-script.el (sh-imenu-generic-expression): Handle 
function names with a single character.
 2013-04-20 03:50:28 +09:00
Masatake YAMATO
7144c62778 * lisp/progmodes/sh-script.el: Implement `sh-mode' own 
`add-log-current-defun-function'.
(sh-current-defun-name): New function.
(sh-mode): Use the function.

Fixes: debbugs:14112
 2013-04-10 02:31:17 +09:00
Paul Eggert
c38e0c974e Prefer UTF-8 when the encoding shouldn't matter and changes are small. 2013-03-05 09:13:01 -08:00