1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-07 06:22:32 -08:00
Commit graph

118442 commits

Author SHA1 Message Date
Eric S. Raymond
92411a0d2e Clean up a longstanding to-do item.
* vc.el (vc-expand-dirs): Now takes a second BACKEND argument,
improving behavior on directories using multiple file-oriented VCSEs.
2014-12-02 04:38:08 -05:00
Eric S. Raymond
2fb8b146f7 Remove clear-headers from VC's public method set.
* vc/vc.el and all backends: API simplification; clear-headers is no
longer a public method.  It is now local to the one place it's used,
in the RCS steal-lock method.
2014-12-01 23:49:35 -05:00
Eric S. Raymond
ea99f8c1ab Fix minor bug introduced in 'Terminate vc-disable-async-diff' 2014-12-01 22:56:01 -05:00
Eric S. Raymond
7d2110560e Update the git backend's header comment. 2014-12-01 20:00:40 -05:00
Eric S. Raymond
b7fd432d56 Remove could-register from the set of public VC backend methods,
* vc/vc.el and all backends: API simplification; could-register
is no longer a public method.  (vc-cvs.el still has a private
implementation.)
2014-12-01 18:54:28 -05:00
Eric S. Raymond
d788058c50 Document a trap for the unwary. 2014-12-01 18:03:38 -05:00
Eric S. Raymond
ed6ce56e23 Terminate vc-disable-async-diff with extreme prejudice.
* vc/vc.el, and all backends: API cleanup; the backend diff method
takes an explicit async flag.  This eliminates a particularly ugly
global.
2014-12-01 17:56:41 -05:00
Glenn Morris
4f54f7b376 Restore ChangeLog entry clobbered earlier today. 2014-12-01 16:35:13 -05:00
Glenn Morris
ab882ed218 * lisp/vc/vc-svn.el: Remove stray comment char introduced earlier today. 2014-12-01 16:32:04 -05:00
Stefan Monnier
517505322a Merge some of the differences from the standalone CC-mode.
The main change is to only use the `category' text-property only when
available.  For that many calls are changed to use c-get-char-property,
c-next-single-property-change, c-sc-scan-lists,
c-sc-parse-partial-sexp, c-unmark-<->-as-paren.

* lisp/progmodes/cc-align.el (c-lineup-respect-col-0): New function.

* lisp/progmodes/cc-cmds.el (c-forward-into-nomenclature)
(c-backward-into-nomenclature): Use cc-subword if subword-mode is
not available.
(c-beginning-of-defun, c-end-of-defun, c-mark-function)
(c-indent-line-or-region): Use c-region-is-active-p.

* lisp/progmodes/cc-defs.el (c-version): Bump up to 5.33.
(c-use-category): New const.
(c-next-single-property-change): New macro.
(c-region-is-active-p): Prefer region-active-p when available.
(c-search-backward-char-property): Fix old min/max typo; probably
a copy/paste error.
(c-mark-<-as-paren, c-mark->-as-paren, c-unmark-<->-as-paren):
Turn them into macros that obey c-use-category.
(c-sc-scan-lists-no-category+1+1, c-sc-scan-lists-no-category+1-1)
(c-sc-scan-lists-no-category-1+1, c-sc-scan-lists-no-category-1-1)
(c-sc-scan-lists, c-sc-parse-partial-sexp)
(c-looking-at-non-alphnumspace): New macros.
(c-sc-parse-partial-sexp-no-category): New function.
(c-emacs-features): Add `category-properties' element.

* lisp/progmodes/cc-engine.el (c-invalidate-state-cache, c-parse-state):
Handle the case where categories are not available.
(c-record-parse-state-state, c-replay-parse-state-state):
Handle marker values.
(c-before-change-check-<>-operators): Look for the `syntax-table'
property rather than for the corresponding `category'.
(c-looking-at-decl-block): Remove unused var
`c-disallow-comma-in-<>-arglists'.
(c-forward-<>-arglist-recur): Remove unused var
`orig-record-found-types'.

* lisp/progmodes/cc-langs.el (c-modified-constant): New lang var.
(c-known-type-key): Don't make a list just to throw it away.

* lisp/progmodes/cc-bytecomp.el (cc-bytecomp-unbound-variables)
(cc-bytecomp-original-functions, cc-bytecomp-original-properties)
(cc-bytecomp-loaded-files): Re-set each time the file is loaded.
(cc-bytecomp-obsolete-var, cc-bytecomp-ignore-obsolete)
(cc-bytecomp-obsolete-fun): Delete unused functions.

* lisp/progmodes/cc-mode.el (c-just-done-before-change): New var.
(c-basic-common-init): Initialize it.
(c-common-init): Only use mode-require-final-newline when available.
(c-before-change): Check and set c-just-done-before-change.
(c-after-change): Re-set c-just-done-before-change.
(c-advise-fl-for-region): New macro.
(lazy-lock-defer-rest-after-change, lazy-lock-defer-line-after-change)
(font-lock-after-change-function, jit-lock-after-change):
Advise if needed.
2014-12-01 15:06:49 -05:00
Eric S. Raymond
808699f136 bzr-state randomly/unpredictably fails on non-bzr files. 2014-12-01 14:51:26 -05:00
Lars Magne Ingebrigtsen
6d80f26a9a shr-dom-print dom.el changes
* net/shr.el (shr-dom-print): Fix up `shr-dom-print' after the
dom.el changes.
2014-12-01 20:18:15 +01:00
Glenn Morris
92c856e8ad ChangeLog fix 2014-12-01 13:48:43 -05:00
Glenn Morris
857f7dff81 Auto-commit of loaddefs files. 2014-12-01 13:36:14 -05:00
Glenn Morris
4bc1cdd563 ChangeLog fixes. 2014-12-01 13:35:16 -05:00
Glenn Morris
e5c0350828 * admin/update_autogen: Fix bogosity introduced in 2014-11-16 merge. 2014-12-01 13:29:03 -05:00
Stefan Monnier
b34578dd88 * lisp/vc: Fix use of find-conflicted-file in Git.
* lisp/vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the
current "project" rather than just the current directory.
* lisp/vc/vc-git.el (vc-git-conflicted-files): Clarify in which directory
the file names make sense.
2014-12-01 13:16:54 -05:00
Stefan Monnier
8dac9c34d8 * lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.
* lisp/vc/smerge-mode.el (smerge-swap): New command.
2014-12-01 13:16:53 -05:00
Ulf Jasper
581914e45f newsticker: Prevent multiple "Could not download..." messages. Fixes bug#19166.
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback):
Pass correct status to `newsticker--sentinel-work'.
(newsticker--sentinel-work): Use "newsticker--download-error" as
guid in order to prevent multiple "Could not download..."
messages.  Fixes bug#19166.

* lisp/net/newst-treeview.el (newsticker--treeview-item-show): Check
window liveliness before measuring its width.
2014-12-01 19:14:54 +01:00
Ivan Shmakov
52fab40c16 Call `eww-after-render-hook' in the correct buffer
Fixes: debbugs:19225

* net/eww.el (eww-render): Call `eww-after-render-hook' in the
correct buffer.
2014-12-01 18:56:02 +01:00
Eric S. Raymond
40ce283460 Test checkin to attempt to tickle a bug reported on the dev list. 2014-12-01 12:06:19 -05:00
Lars Magne Ingebrigtsen
f8b82217c7 * net/nsm.el (network-security-level): Change the default to `medium'. 2014-12-01 17:47:05 +01:00
Eric S. Raymond
8bb7019c27 ChangeLog typo fix. 2014-12-01 11:44:34 -05:00
Eric S. Raymond
d17bae9039 Refactor VC merging to fix a layer violation.
* vc/vc.el, vc/vc-cvs.el, vc/vc-rcs.el, vc/vc-svn.el: The 'merge'
backend method of RCS/CVS/SVN is now 'merge-file', to contrast with
'merge-branch'. Prompting for merge revisions is pushed down to the
back ends; this fixes a layering violation that caused bad behavior
with SVN.
2014-12-01 11:43:10 -05:00
Lars Magne Ingebrigtsen
dce46a7484 * .gitignore: Ignore loaddefs directly under lisp, and in sub-sub-directories 2014-12-01 17:11:50 +01:00
Lars Magne Ingebrigtsen
31410dcb09 Minor eww point placement fixup
* net/eww.el (eww): Leave point in a place that doesn't cause
scrolling when displaying "Loading...".
2014-12-01 17:09:01 +01:00
Eric S. Raymond
cb8ed25555 Small but crucial change for new VC registration API. 2014-12-01 10:59:05 -05:00
Eric S. Raymond
4893831f69 Update some documentation changes and todo items. 2014-12-01 10:57:09 -05:00
Eric S. Raymond
185320a5fe Finish vc-stay-local containment.
* vc/vc.el, vc-hooks.el, and all backends: API simplification;
vc-stay-local-p and repository-hostname are no longer public
methods. Only the CVS and SVN backends used these, and the SVN
support was conditioned out because svn status -v is too slow.
The CVS back end retaiin this machibery and the vc-stay-local
configuration variable now only affects it.
2014-12-01 10:47:27 -05:00
Eric S. Raymond
2a81c5d94d Confine vc-stay-local to CVS, because it was unusable in SVN. 2014-12-01 10:11:42 -05:00
Eric S. Raymond
c108372525 Remove stay-local support in svn back end, because...
...status -v is so slow that it's unusable.
2014-12-01 10:04:10 -05:00
Stefan Monnier
f0e8c1eac2 New macro `define-inline'.
* lisp/emacs-lisp/inline.el: New file.
2014-12-01 09:45:15 -05:00
Eric S. Raymond
578d91ac50 Remove vc-state-heuristic from the set of public methods.
* vc/vc.el, vc-hooks.el, and all backends: API simplification;
vc-state-heuristic is no longer a public method, having been removed
where it is redundant, unnecessary, or known buggy. This eliminated
all backends except CVS.  Eliminates bug#7850.
2014-12-01 09:41:54 -05:00
Eric S. Raymond
33b4235db6 The vc-mistrust-permissions configuration variable is gone.
* vc/vc-cvs.el, vc/vc-hooks.el, vc/vc-rcs.el, vc/vc-sccs.el: Eliminate
vc-mistrust-permissions.  It was only relevant to the RCS and SCCS
back ends and defaulted to t. Code now always mistrusts permissions -
by actual measurement the effect on performance is negligible. As a
side effect bug#11490 is now irrelevant.
2014-12-01 09:08:26 -05:00
Eric S. Raymond
f82f3f1f17 API simplification: remove vc-workfile-unchanged-p from pubic methods.
* vc/vc.el, vc-hooks.el, and all backends: API simplification;
vc-workfile-unchanged-p is no longer a public method (but the RCS and
SCCS back ends retain it as a private method used in state
computation). This method was redundant with vc-state and usually
implemented as a trivial call to same. Fixes the failure mode
described in bug#694.
2014-12-01 08:24:27 -05:00
Eric S. Raymond
2532d74a5f Renove duplicate code. 2014-12-01 07:39:15 -05:00
Eric S. Raymond
9e9e3432fa Argument removal inadvertently omitted from my previous commit. 2014-12-01 07:08:40 -05:00
Eric S. Raymond
2f4f920079 VC API simplification: remove ability to set initial revision.
This hasn't made any sense since RCS, and was a dumb stunt then.

* vc/vc.el and all backends: API simplification; init-revision is
gone, and vc-registered functions no longer take an initial-revision
argument.
2014-12-01 06:23:10 -05:00
Glenn Morris
7536c8645e * lisp/gnus/gnus-cloud.el (gnus-cloud): Add :version tag. 2014-12-01 00:28:08 -08:00
Paul Eggert
3517da701e Port better to AddressSanitizer.
These changes suffice for temacs on x86-64 with GCC 4.9.2 and
-fsanitize=address.
* alloc.c (valid_pointer_p) [ADDRESS_SANITIZER]:
Return -1 or 0, as the pipe trick doesn't work.
* alloc.c (relocatable_string_data_p, mark_object, sweep_symbols):
* data.c (Ffset):
* print.c (print_object):
When a pointer-check primitive returns -1, do not assume this
means the pointer is valid or that the underlying system has failed.
It could just be that addresses are being sanitized so Emacs can't
test for pointer validity.
* lisp.h (defined_GC_CHECK_STRING_BYTES): New constant.
(USE_STACK_STRING) [GC_CHECK_STRING_BYTES]: Now false, since the
string validity checker doesn't work on stack-based strings.
2014-11-29 23:32:29 -08:00
Glenn Morris
70723e5107 ChangeLog fix. 2014-11-29 16:51:13 -08:00
Glenn Morris
6228c5d4d9 ChangeLog fix: standardize some bug refs. 2014-11-29 13:50:13 -08:00
Glenn Morris
9457d88b43 Add missing ChangeLog entry. 2014-11-29 13:44:31 -08:00
Glenn Morris
9402d80f25 * lisp/vc/vc-filewise.el: Comment fixes. 2014-11-29 13:38:29 -08:00
Glenn Morris
741f5e15dd * lisp/vc/vc-src.el: Fix copy-pasted :version tags. 2014-11-29 13:34:29 -08:00
Glenn Morris
1252594e56 ChangeLog fix 2014-11-29 13:31:57 -08:00
Glenn Morris
aa1459ae2a Fix up merged ChangeLog entries (dates, duplication, etc) 2014-11-29 13:25:50 -08:00
Paul Rankin
287740d6ed * outline.el (outline-move-subtree-down): Refactor and improve code. 2014-11-29 14:56:59 +01:00
Paul Eggert
dbff8fd118 Spelling fix. 2014-11-28 23:55:17 -08:00
Paul Eggert
366c1ceb03 Improve clarity of USE_LSB_TAG definition.
Problem reported by Lee Duhem.  Suggestion by Andreas Schwab in:
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg02222.html
* lisp.h (USE_LSB_TAG): Define in terms of the (simpler)
VAL_MAX / 2 rather than in terms of the (more complicated)
EMACS_INT_MAX >> GCTYPEBITS, and adjust commentary to match.
2014-11-28 23:39:06 -08:00