summaryrefslogtreecommitdiff
path: root/lisp
Commit message (Collapse)AuthorAgeFilesLines
* Cleanups and fixes for mouse-save-then-kill and mouse-secondary-save-then-kill.Chong Yidong2010-08-212-548/+170
| | | | | | | | | * mouse.el (mouse-save-then-kill): Don't save region to kill ring when extending it. Before killing on the second click, check if the buffer is the correct one. Doc fix. (mouse-secondary-save-then-kill): Allow usage without first calling mouse-start-secondary, by defaulting to point. Don't save an empty secondary selection. Doc fix.
* Fix slow cursor movement.Vinicius Jose Latorre2010-08-212-34/+163
|
* ChangeLog fixes.Glenn Morris2010-08-201-7/+7
|
* merge from upstreamJoakim Verona2010-08-204-56/+110
|\
| * * lisp/files.el (locate-file-completion-table): Only list the .el and .elcStefan Monnier2010-08-192-11/+37
| | | | | | | | | | | | extensions if there's no other choice. Fixes: debbugs:5955
| * New post-self-insert-hook.Stefan Monnier2010-08-192-44/+66
| | | | | | | | | | | | | | | | | | | | | | * src/cmds.c (Vself_insert_face, Vself_insert_face_command): Remove. (Qpost_self_insert_hook, Vpost_self_insert_hook): New vars. (internal_self_insert): Run post-self-insert-hook rather than handle self-insert-face. (syms_of_cmds): Initialize the new vars. * lisp/facemenu.el (facemenu-self-insert-data): New var. (facemenu-post-self-insert-function, facemenu-set-self-insert-face): New funs. (facemenu-add-face): Use them.
| * * lisp/simple.el (blink-matching-open): Obey forward-sexp-function.Stefan Monnier2010-08-192-1/+7
| |
* | minor imagemagick tweaks, one configure bugfix, and some ChangeLogsJoakim Verona2010-08-201-0/+11
|/
* upstream mergeJoakim Verona2010-08-198-119/+150
|\
| * Fix previous Org change.Glenn Morris2010-08-184-58/+70
| | | | | | | | | | | | | | | | | | * org.el (org-outline-overlay-data, org-set-outline-overlay-data) (org-save-outline-visibility): Move to org-macs. * org-macs.el (org-outline-overlay-data, org-set-outline-overlay-data) (org-save-outline-visibility): Move here from org.el. (show-all): Autoload it. * ob.el: Don't require org when compiling.
| * * lisp/simple.el (prog-mode-map): New var.Stefan Monnier2010-08-192-0/+16
| | | | | | | | (prog-indent-sexp): New command.
| * * lisp/progmodes/octave-mod.el (octave-mode-menu): Make toggle buttons.Stefan Monnier2010-08-182-3/+6
| |
| * Reindent smie.elStefan Monnier2010-08-181-57/+57
| |
| * * smie.el (smie-forward-sexp-command): Fix typo.Stefan Monnier2010-08-181-1/+1
| |
* | merge from trunk, no conflictsJoakim Verona2010-08-1814-265/+530
|\|
| * * lisp/progmodes/prolog.el (smie): Require.Stefan Monnier2010-08-182-1/+3
| |
| * Try and remove some of SMIE's black magic by generalizing some rules.Stefan Monnier2010-08-182-128/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/emacs-lisp/smie.el (smie-default-backward-token) (smie-default-forward-token): Strip properties. (smie-next-sexp): Be more careful with associative operators. (smie-forward-sexp-command): Generalize. (smie-backward-sexp-command): Simplify. (smie-closer-alist): New var. (smie-close-block): New command. (smie-indent-debug-log): New var. (smie-indent-offset-rule): Add a few more cases. (smie-indent-column): New function. (smie-indent-after-keyword): Use it. (smie-indent-keyword): Use it. Fix up the opener code's point position. (smie-indent-comment): Only applies at BOL. (smie-indent-debug): New command.
| * * lisp/emacs-lisp/autoload.el (make-autoload): Preload the macros'sStefan Monnier2010-08-182-19/+43
| | | | | | | | | | declarations that are useful before running the macro. * src/eval.c (Fdefmacro): Only obey one declaration.
| * create-animated-image: Don't add heuristic mask to image (Bug#6839).Katsumi Yamaoka2010-08-182-1/+6
| |
| * Use CLIPBOARD and PRIMARY on NS (Bug#6677).Jan D2010-08-182-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard): Use QCLIPBOARD instead of QPRIMARY (Bug#6677). * src/nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define. (symbol_to_nsstring): Map QCLIPBOARD => NSGeneralPboard, QPRIMARY => NXPrimaryPboard. (ns_string_to_symbol): NSGeneralPboard => QCLIPBOARD, NXPrimaryPboard => QPRIMARY. (nxatoms_of_nsselect): NXPrimaryPboard = PrimarySelection, NXSecondaryPboard = SecondarySelection. (syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
| * Fix some more Org `check-declare' issues.Glenn Morris2010-08-174-9/+17
| | | | | | | | | | | | | | | | | | | | * ob.el: Require org when compiling. (org-save-outline-visibility): Remove macro declaration. * ob-emacs-lisp.el: Require ob-comint when compiling, for macros. Remove unnecessary/macro declarations. * org-docview.el: Require doc-view when compiling. (doc-view-goto-page): Autoload rather than declaring. (doc-view-current-page): Remove macro declaration.
| * Fix typo in previous gnus-sum.el change.Glenn Morris2010-08-171-1/+1
| |
| * * lisp/emacs-lisp/lisp.el (up-list): Obey forward-sexp-function if set.Stefan Monnier2010-08-172-1/+9
| |
| * * lisp/newcomment.el (comment-add): Move comment to docstring.Stefan Monnier2010-08-171-5/+5
| |
| * Restore lisp/ChangeLog entries clobbered in ↵Glenn Morris2010-08-171-0/+14
| | | | | | | | 2010-08-17T10:07:41Z!jan.h.d@swipnet.se.
| * Font-lock '...' strings, plus various simplifications and fixes.Stefan Monnier2010-08-172-100/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/octave-mod.el (octave-font-lock-keywords): Use regexp-opt. (octave-font-lock-close-quotes): New function. (octave-font-lock-syntactic-keywords): New var. (octave-mode): Use it. Set beginning-of-defun-function. (octave-mode-map): Don't override the <foo>-defun commands. (octave-mode-menu): Pass it directly to easy-menu-define; remove (now generic) <foo>-defun commands; use info-lookup-symbol. (octave-block-match-alist): Fix up last change so that octave-close-block uses the more specific keyword. (info-lookup-mode): Silence byte-compiler. (octave-beginning-of-defun): Not interactive any more. Optimize slightly. (octave-end-of-defun, octave-mark-defun, octave-in-defun-p): Remove. (octave-indent-defun, octave-send-defun): Use mark-defun instead. (octave-completion-at-point-function): Make sure point is within beg..end. (octave-reindent-then-newline-and-indent): Use reindent-then-newline-and-indent. (octave-add-octave-menu): Remove.
* | merge from trunkJoakim Verona2010-08-17273-5587/+23472
|\|
| * Add command C-c m in report-emacs-bug that puts the bug into preferred mailer.Jan Djärv2010-08-172-13/+59
| | | | | | | | | | | | | | | | | | | | | | Depends on xdg-email being available. * lisp/mail/emacsbug.el (report-emacs-bug-insert-to-mailer) (report-emacs-bug-can-use-xdg-email): New functions. (report-emacs-bug): Set can-xdg-email to result of report-emacs-bug-can-use-xdg-email. If can-xdg-email bind \C-cm to report-emacs-bug-insert-to-mailer and add help text about it.
| * Add ability to use xdg-open, i.e. your desktop default browser.Jan Djärv2010-08-172-0/+42
| | | | | | | | | | | | * net/browse-url.el (browse-url-default-browser): Add cond for browse-url-xdg-open (browse-url-can-use-xdg-open, browse-url-xdg-open): New functions
| * Fix some Org errors revealed by `make check-declare'.Glenn Morris2010-08-175-12/+21
| | | | | | | | | | | | | | | | | | | | | | * ob.el (tramp-compat-make-temp-file, org-edit-src-code) (org-entry-get, org-table-import): Fix declarations. (org-match-string-no-properties): Remove declaration. * ob-sh.el (org-babel-comint-in-buffer) (org-babel-comint-wait-for-output, org-babel-comint-buffer-livep) (org-babel-comint-with-output): Remove unnecessary declarations. * ob-R.el (orgtbl-to-tsv): Fix declaration. * org-list.el (org-entry-get): Fix declaration.
| * Silence more Gnus compiler warnings.Glenn Morris2010-08-172-0/+4
| | | | | | | | * lisp/gnus/gnus-sync.el: Require Gnus components whose functions are used.
| * Silence some Gnus compiler warnings.Glenn Morris2010-08-174-0/+14
| | | | | | | | | | | | | | | | * lisp/gnus/gnus-art.el (bookmark-make-record-function): * lisp/gnus/gnus-sum.el (bookmark-yank-point, bookmark-current-bookmark): Declare for compiler. * lisp/gnus/mm-url.el (mml-compute-boundary): Autoload.
| * Silence some cc-mode compiler warnings.Glenn Morris2010-08-163-13/+25
| | | | | | | | | | | | | | * lisp/progmodes/cc-engine.el (c-new-BEG, c-new-END) (c-fontify-recorded-types-and-refs): Define for compiler. * lisp/progmodes/cc-mode.el (c-new-BEG, c-new-END): Move definitions before use.
| * Minor icalendar fix.Glenn Morris2010-08-162-0/+6
| | | | | | | | | | * lisp/calendar/icalendar.el (icalendar--convert-recurring-to-diary): Fix format call.
| * * net/tramp.el (tramp-handle-make-symbolic-link): Flush fileMichael Albinus2010-08-172-5/+22
| | | | | | | | | | | | | | | | properties. (tramp-handle-process-file): Call the program in a subshell, in order to preserve working directory. (tramp-action-password): Hide password prompt before next run. (tramp-process-actions): Widen connection buffer for the trace.
| * Don't always log RCIRC process buffers to disk (Bug#6828).Deniz Dogan2010-08-152-2/+23
| | | | | | | | | | | | | | | | * lisp/net/rcirc.el (rcirc-log-process-buffers): New option. (rcirc-print): Use it. (rcirc-generate-log-filename): New function. (rcirc-log-filename-function): Change default to rcirc-generate-log-filename (Bug#6828).
| * Let all active regions set the primary selection.Chong Yidong2010-08-153-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes both temporarily active regions (mouse drag and shift-select) and those made with C-SPC and cursor motion. * lisp/cus-start.el: Change defcustom for select-active-regions. * lisp/simple.el (deactivate-mark): If select-active-regions is `only', only set selection for temporarily active regions. * src/insdel.c (prepare_to_modify_buffer): Handle `only' value of select-active-regions. * src/keyboard.c (command_loop_1): Avoid setting selection twice, since it's done in deactivate-mark as well. (Vselect_active_regions): Replace `lazy' value with `only', meaning to only set PRIMARY for temporarily active regions.
| * Fix mouse dragging of words and lines (Bug#6840).Chong Yidong2010-08-152-14/+29
| | | | | | | | | | | | | | * mouse.el (mouse--drag-set-mark-and-point): New function. (mouse-drag-track): Use LOCATION arg to push-mark. Use mouse--drag-set-mark-and-point to take click-count into consideration when updating point and mark (Bug#6840).
| * gnus-start-draft-setup: Move doc string forward.Katsumi Yamaoka2010-08-152-1/+5
| |
| * Give Ruby compilation rule a lower priority than Gnu (Bug#6778).Chong Yidong2010-08-142-4/+9
| | | | | | | | | | | | | | * progmodes/compile.el (compilation-error-regexp-alist-alist): Give the Ruby rule a lower priority than Gnu (Bug#6778). * etc/compilation.txt: Make Cucumber test less verbose.
| * Add four macros to lisp-font-lock-keywords-2 (Bug#6025).Štěpán Němec2010-08-142-5/+14
| | | | | | | | | | | | * font-lock.el (lisp-font-lock-keywords-2): Add combine-after-change-calls, condition-case-no-debug, with-demoted-errors, and with-silent-modifications (Bug#6025).
| * Fix ChangeLog entry in last commit.Chong Yidong2010-08-141-1/+2
| |
| * Save window excursion before prompting in copyright-update-* (Bug#5394).Kevin Ryde2010-08-142-9/+18
| | | | | | | | | | * emacs-lisp/copyright.el (copyright-update-year) (copyright-update): Use save-window-excursion (Bug#5394).
| * * lisp/progmodes/etags.el (tags-file-name): Mark safe if stringp (Bug#6733).Tom Tromey2010-08-142-0/+6
| |
| * Allow delayed autojoin in ERC (Bug#5521).Vivek Dasmohapatra2010-08-142-4/+79
| | | | | | | | | | | | | | * erc/erc-join.el (erc-autojoin-timing, erc-autojoin-delay): New vars. (erc-autojoin-channels-delayed, erc-autojoin-after-ident): New functions. (erc-autojoin-channels): Allow autojoining after ident (Bug#5521).
| * Typo fix "hoo4a" -> "hook".Katsumi Yamaoka2010-08-142-15/+17
| | | | | | | | | | | | From Ted Zlatanov <tzz@lifelogs.com>. * gnus-sync.el (gnus-sync-install-hooks): Typo fix.
| * Fix bug #6689 with mouse-2 pasting on Windows.Eli Zaretskii2010-08-142-2/+14
| | | | | | | | | | mouse.el (mouse-yank-primary): On MS-Windows and MS-DOS, call x-get-selection-value in preference to x-get-selection.
| * Ammended for bug fix on the loader nunion.Katsumi Yamaoka2010-08-142-8/+11
| | | | | | | | | | | | From Ted Zlatanov <tzz@lifelogs.com>. * (gnus-sync-save): Keep unknown groups in `gnus-sync-newsrc-loader'.
| * Doc fixes and keep unknown groups.Katsumi Yamaoka2010-08-142-13/+24
| | | | | | | | | | | | | | | | From Ted Zlatanov <tzz@lifelogs.com>. * gnus-sync.el: Fix docs. (gnus-sync-save): Keep unknown groups in `gnus-sync-newsrc-loader'. (gnus-sync-read): Don't wipe `gnus-sync-newsrc-loader' after reading.
| * * lisp/gnus/gnus-sync.el (gnus-sync): Fix defgroup version.Glenn Morris2010-08-132-3/+6
| |