Fix bug #16434 with handling the -rv command-line option.
[bpt/emacs.git] / lisp / ChangeLog
index b99c5f0..71f3749 100644 (file)
@@ -1,3 +1,540 @@
+2014-04-05  Matthias Dahl  <ml_emacs-lists@binary-island.eu>
+
+       * faces.el (face-spec-recalc): Call make-face-x-resource-internal
+       only when inhibit-x-resources is nil, and do that earlier in the
+       function.  Doc fix.  (Bug#16694)
+       (face-spec-choose): Accept additional optional argument, whose
+       value is returned if no matching attributes are found.
+       (face-spec-recalc): Use the new optional argument when calling
+       face-spec-choose.  (Bug#16378)
+       (make-face-x-resource-internal): Do nothing when
+       inhibit-x-resources is non-nil.  Don't touch the default face if
+       reversed video is given--as was done in previous versions of
+       Emacs.
+       (face-set-after-frame-default): Don't call
+       make-face-x-resource-internal here.  (Bug#16434)
+
+2014-04-04  Tassilo Horn  <tsdh@gnu.org>
+
+       * doc-view.el (doc-view-bookmark-jump): Use
+       `bookmark-after-jump-hook' to jump to the right page after the
+       buffer is shown in a window.  (bug#16090)
+
+2014-04-04  Eli Zaretskii  <eliz@gnu.org>
+
+       * international/characters.el (mirroring): Fix last change:
+       instead of loading uni-mirrored.el explicitly, do that implicitly
+       by creating the 'mirroring' uniprop table.  This avoids announcing
+       the loading of uni-mirrored.el.
+
+2014-04-04  Glenn Morris  <rgm@gnu.org>
+
+       * files.el (buffer-stale--default-function)
+       (buffer-stale-function, revert-buffer--default):
+       * autorevert.el (auto-revert-buffers): Doc tweaks.
+
+2014-04-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * international/characters.el: Preload uni-mirrored.el.  (Bug#17169)
+
+2014-04-03  Glenn Morris  <rgm@gnu.org>
+
+       * files.el (make-backup-file-name-function)
+       (make-backup-file-name, make-backup-file-name--default-function)
+       (make-backup-file-name-1, find-backup-file-name)
+       (revert-buffer-function, revert-buffer-insert-file-contents-function)
+       (buffer-stale--default-function, buffer-stale-function)
+       (before-revert-hook, after-revert-hook, revert-buffer-in-progress-p)
+       (revert-buffer, revert-buffer--default)
+       (revert-buffer-insert-file-contents--default-function):
+       Doc fixes related to defaults no longer being nil.
+       (make-backup-file-name-function): Bump :version.
+       Restore nil as a valid but deprecated custom type.
+
+2014-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/perl-mode.el (perl-syntax-propertize-function): Handle $'
+       used as a variable (bug#17174).
+
+2014-04-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/perl-mode.el (perl-indent-new-calculate):
+       Handle forward-sexp failure (bug#16985).
+       (perl-syntax-propertize-function): Add "foreach" and "for" statement
+       modifiers introducing expressions (bug#17116).
+
+2014-04-02  Glenn Morris  <rgm@gnu.org>
+
+       * menu-bar.el (menu-bar-file-menu):
+       * vc/ediff.el (ediff-current-file):
+       Update for revert-buffer-function no longer being nil by default.
+
+       * simple.el (command-execute): Respect nil disabled-command-function.
+
+2014-04-01  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
+
+       * simple.el (command-execute): Do not execute the command when it
+       is disabled; fixes thinko in 2013-02-20 conversion from C.  (Bug#17151)
+
+2014-03-29  Juri Linkov  <juri@jurta.org>
+
+       * dired-aux.el (dired-compress-file): Don't use string-match-p
+       because its match data is used afterwards.
+
+2014-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/package.el (package-built-in-p): Treat a min-version of
+       0 like nil.
+
+2014-03-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords):
+       Highlight special globals with font-lock-builtin-face.  (Bug#17057)
+
+       * progmodes/ruby-mode.el (ruby-syntax-propertize-function):
+       Don't propertize `?' or `!' as symbol constituent when after
+       colon.  (Bug#17097)
+
+2014-03-27  Juanma Barranquero  <lekktu@gmail.com>
+
+       * frameset.el (frameset--restore-frame): Remove workaround for bug#14795
+       which is no longer needed and causes trouble in GTK builds (bug#17046).
+
+       * emacs-lisp/package-x.el (package--archive-contents-from-url):
+       Use url-insert-file-contents; package-handle-response no longer exists.
+
+2014-03-26  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacs-lisp/package.el: Fix bug#16733 (again).
+       (url-http-parse-response, url-http-end-of-headers, url-recreate-url)
+       (url-http-target-url): Remove unused declarations.
+       (package-handle-response): Remove.
+       (package--with-work-buffer): Use url-insert-file-contents and simplify.
+       (package--download-one-archive): Use current-buffer instead of
+       dynamic binding of `buffer'.
+       (describe-package-1): Do not decode readme-string.
+
+2014-03-25  Barry O'Reilly  <gundaetiapo@gmail.com>
+
+       * simple.el (primitive-undo): Correction to 2014-03-24 change.
+
+2014-03-25  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-methods, tramp-connection-timeout): Fix docstring.
+
+       * net/tramp-sh.el (tramp-sh-handle-vc-registered): Revert change
+       from 2014-03-07, it decreases performance unnecessarily.  Let-bind
+       `remote-file-name-inhibit-cache' to nil in the second pass.
+       (tramp-find-executable): Do not call "which" on SunOS.
+       (tramp-send-command-and-check): Fix docstring.
+       (tramp-do-copy-or-rename-file-directly): In the `rename' case,
+       check whether source directory has set the sticky bit.
+
+2014-03-24  Barry O'Reilly  <gundaetiapo@gmail.com>
+
+       * simple.el (primitive-undo): Only process marker adjustments
+       validated against their corresponding (TEXT . POS).  Issue warning
+       for lone marker adjustments in undo history.  (Bug#16818)
+       (undo-make-selective-list): Add marker adjustments to selective
+       undo list based on whether their corresponding (TEXT . POS) is in
+       the region.  Remove variable adjusted-markers, which was unused
+       and only non nil during undo-make-selective-list.
+       (undo-elt-in-region): Return nil when passed a marker adjustment
+       and explain in function doc.
+
+2014-03-24  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * emacs-lisp/package.el (package--add-to-archive-contents):
+       Include already installed and built-in packages in
+       `package-archive-contents'.
+       (package-install): Don't include already installed packages in the
+       options during interactive invocation.  (Bug#16762)
+
+2014-03-24  Daniel Colascione  <dancol@dancol.org>
+
+       * emacs-lisp/cl-macs.el (cl--do-arglist): Use `plist-member'
+       instead of cl-loop search function.
+
+2014-03-24  Juanma Barranquero  <lekktu@gmail.com>
+
+       * frameset.el (frameset--initial-params): Fix typo in parameter name.
+
+2014-03-24  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
+
+       * align.el (align-region): Do not fail when end-mark is nil (bug#17088).
+
+2014-03-24  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-expression-expansion-re):
+       Match special global variables without curlies, too.
+       (ruby-font-lock-keywords): Simplify the matcher for special global
+       variables.  Don't require a non-word character after the variable.
+       (Bug#17057)
+
+2014-03-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * simple.el (redisplay-highlight-region-function): Increase priority of
+       overlay to make sure boundaries are visible (bug#15899).
+
+2014-03-23  Juanma Barranquero  <lekktu@gmail.com>
+
+       * frameset.el (frameset-restore): Compare display strings with equal.
+
+       * frame.el (make-frame): Don't quote display name in error message,
+       it is already a string.
+
+2014-03-23  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+       * net/tramp.el (tramp-read-passwd): Suspend the timers while reading
+       the password.
+
+2014-03-23  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * emacs-lisp/package.el (package-show-package-list): If the buffer
+       is already displayed in another window, switch to that window.
+
+2014-03-21  Daniel Colascione  <dancol@dancol.org>
+
+       * mail/emacsbug.el (report-emacs-bug): Include memory usage
+       information in bug reports.
+
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+       * emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop'
+       list to look for keyword arguments instead of `memq', fixing
+       (Bug#3647) --- unfortunately, only for freshly-compiled code.
+       Please make bootstrap.
+
+2014-03-23  Richard Stallman  <rms@gnu.org>
+
+       * battery.el (battery-linux-sysfs): Search for each field
+       from the beginning of the buffer.
+
+2014-03-22  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * emacs-lisp/package.el (package-desc): Use the contents of the
+       quoted form, not its cdr.  (Bug#16873)
+
+2014-03-22  Juanma Barranquero  <lekktu@gmail.com>
+
+       * w32-common-fns.el (x-selection-owner-p): Add empty docstring for the
+       benefit of doc.c; change parameter profile to match the X function.
+
+2014-03-21  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-methods): Add docstring for `tramp-login-env'
+       and `tramp-copy-env'.
+
+       * net/tramp-sh.el (tramp-methods) <sudo>: Add `tramp-login-env'.
+       (tramp-maybe-open-connection): Handle `tramp-login-env'.
+
+2014-03-21  Glenn Morris  <rgm@gnu.org>
+
+       * electric.el (electric-indent-post-self-insert-function): Add doc.
+
+2014-03-21  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * emacs-lisp/package.el (package-compute-transaction):
+       Use `version-list-<=' to compare the requirement version against
+       the version of package already to be installed.  Update the error
+       message.  (Bug#16826)
+
+       * progmodes/ruby-mode.el (ruby-smie-rules):
+       Add indentation rule for ` @ '.  (Bug#17050)
+
+2014-03-21  Juanma Barranquero  <lekktu@gmail.com>
+
+       * align.el (align-regexp): Remove superfluous backslash.
+
+       * ffap.el (ffap-ftp-default-user, ffap-url-regexp)
+       (ffap-pass-wildcards-to-dired, dired-at-point-require-prefix)
+       (ffap-rfc-path, ffap-ftp-sans-slash-regexp, ffap-menu-regexp):
+       Fix docstring typos.
+       (ffap-next): Use C-u in docstring.
+       (ffap-machine-p, ffap-list-env, ffap-alist, ffap-alist)
+       (ffap-string-at-point-mode-alist, ffap-menu, ffap-menu-ask):
+       Remove superfluous backslashes.
+       (ffap-string-at-point): Reflow docstring.
+
+       * server.el (server-host): Reflow docstring.
+       (server-unload-function): Fix docstring typo.
+       (server-eval-at): Remove superfluous backslash.
+
+       * skeleton.el (skeleton-insert): Remove superfluous backslash.
+       (skeleton-insert): Doc fix.
+       (skeleton-insert): Reflow docstring.
+
+       * term/tty-colors.el (tty-color-alist, tty-modify-color-alist)
+       (tty-color-approximate, tty-color-by-index, tty-color-values)
+       (tty-color-desc): Remove superfluous backslashes.
+
+2014-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * electric.el (electric-newline-and-maybe-indent): New command.
+       Bind it globally to C-j.
+       (electric-indent-mode): Don't mess with the global map any more.
+       Don't drop the post-self-insert-hook is some buffer is still using it
+       (bug#16770).
+
+       * bindings.el (global-map): Remove C-j binding.
+
+       * emacs-lisp/nadvice.el (advice--make-docstring): Try harder to find
+       the docstring of functions advised before dumping (bug#16993).
+
+2014-03-19  Stefan-W. Hahn  <stefan.hahn@s-hahn.de>  (tiny change)
+
+       * ps-print.el (ps-generate-postscript-with-faces):
+       Explicitly deactivate the mark (bug#16866).
+       * simple.el (deactivate-mark): Update region highlight.
+
+2014-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacs-lisp/package.el (describe-package-1):
+       Decode commentary (bug#16733).
+
+2014-03-18  Juanma Barranquero  <lekktu@gmail.com>
+
+       * custom.el (defcustom): Doc fix: recommend avoiding destructive
+       modification of the value argument of :set (bug#16755).
+
+2014-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * simple.el (newline-and-indent): Do autofill (bug#17031).
+
+2014-03-18  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * newcomment.el (comment-normalize-vars): Only add escaping check
+       to `comment-start-skip' if not `comment-use-syntax'.  (Bug#16971)
+       (comment-beginning): Use `narrow-to-region' instead of moving back
+       one character.
+       (http://lists.gnu.org/archive/html/emacs-devel/2014-03/msg00488.html)
+       (comment-start-skip): Update the docstring.
+
+2014-03-18  Richard Stallman  <rms@gnu.org>
+
+       * dired.el (dired-display-file): Force use of other window.
+
+2014-03-18  Daniel Colascione  <dancol@dancol.org>
+
+       * startup.el (tty-handle-args): Remove debug message from 2007.
+
+2014-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/nadvice.el (advice--interactive-form): New function.
+       (advice--make-interactive-form): Use it to avoid (auto)loading function.
+       (advice--make-1, advice-add, advice-remove):
+       Remove braindead :advice-pending hack.
+
+2014-03-17  Glenn Morris  <rgm@gnu.org>
+
+       * calendar/calendar.el (calendar-generate-month): Apply weekend
+       face to the right days; fixes 2013-08-06 change.  (Bug#17028)
+
+2014-03-17  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-action-out-of-band): Read pending output.
+       (tramp-call-process): Trace also DESTINATION.
+
+       * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
+       Quote file names when they are local.  Remove superfluous trace.
+
+2014-03-17  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * newcomment.el (comment-beginning): If `comment-start-skip'
+       doesn't match, move back one char and try again.  (Bug#16971)
+
+       * emacs-lisp/lisp-mode.el (lisp-mode-variables):
+       Set `comment-use-syntax' to t to avoid the unnecessary runtime check.
+       Set `comment-start-skip' to a simpler value that doesn't try to
+       check if the semicolon is escaped (this is handled by
+       `syntax-ppss' now).  (Bug#16971)
+
+       * progmodes/scheme.el (scheme-mode-variables): Same.
+
+2014-03-16  Martin Rudalics  <rudalics@gmx.at>
+
+       Fix behavior of with-temp-buffer-window (Bug#16816, Bug#17007).
+       * window.el (with-temp-buffer-window): Don't make BUFFER-OR-NAME
+       current (Bug#16816, Bug#17007).
+       (with-current-buffer-window): New macro doing the same as
+       `with-temp-buffer-window' but with BUFFER-OR-NAME current.
+       * help.el (help-print-return-message): Warn in doc-string to not
+       use this in `with-help-window'.
+       (describe-bindings-internal): Call `describe-buffer-bindings'
+       from within help buffer.  See Juanma's scenario in (Bug#16816).
+       (with-help-window): Update doc-string.
+       * dired.el (dired-mark-pop-up):
+       * files.el (save-buffers-kill-emacs):
+       * register.el (register-preview): Use `with-current-buffer-window'
+       instead of `with-temp-buffer-window'.
+
+2014-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+       * textmodes/rst.el (rst-arabic-to-roman, rst-roman-to-arabic):
+       Implement inserting into current buffer, documented in their docstrings.
+       (rst-define-key, rst-compare-adornments, rst-insert-list-new-item)
+       (rst-section-tree-point, rst-forward-section, rst-indent)
+       (rst-compute-tabs, rst-font-lock-find-unindented-line-end)
+       (rst-font-lock-find-unindented-line-limit, rst-adornment-level)
+       (rst-font-lock-handle-adornment-pre-match-form)
+       (rst-repeat-last-character): Reflow docstrings.
+       (rst-preferred-adornments, rst-update-section, rst-find-title-line)
+       (rst-adjust-adornment-work, rst-initial-items, rst-insert-list)
+       (rst-toc-insert-style, rst-toc-insert-node, rst-goto-section)
+       (rst-compile, rst-imenu-convert-cell, rst-imenu-create-index):
+       Fix docstring typos.
+       (rst-all-sections, rst-section-hierarchy, rst-adjust): Doc fixes.
+       (rst-uncomment-region, rst-font-lock-find-unindented-line-match)
+       (rst-font-lock-handle-adornment-matcher): Mark unused arguments.
+
+2014-03-15  Juanma Barranquero  <lekktu@gmail.com>
+
+       * term/ns-win.el (x-command-line-resources): Rename from ns-... version,
+       for compatibility with other ports.
+       (ns-initialize-window-system): Use it.  It is set in term/common-win.el
+       from the -xrm command line argument, but in the Nextstep port its value
+       is irrelevant because nsfns.m:Fx_open_connection ignores it for now.
+
+       * progmodes/python.el (defconst, python-syntax-count-quotes)
+       (python-indent-region, python-indent-shift-right)
+       (python-indent-dedent-line-backspace, python-nav-backward-sexp)
+       (python-nav-backward-sexp-safe, python-nav-backward-up-list)
+       (python-shell-prompt-block-regexp, python-shell-prompt-output-regexp)
+       (python-shell-prompt-pdb-regexp, python-shell-enable-font-lock)
+       (inferior-python-mode, python-shell-make-comint, run-python-internal)
+       (python-shell-buffer-substring, python-shell-send-buffer)
+       (python-pdbtrack-activate, python-pdbtrack-stacktrace-info-regexp)
+       (python-completion-complete-at-point, python-fill-docstring-style)
+       (python-eldoc-function, python-imenu-format-item-label)
+       (python-imenu-format-parent-item-label)
+       (python-imenu-format-parent-item-jump-label)
+       (python-imenu--build-tree, python-imenu-create-index)
+       (python-imenu-create-flat-index): Fix docstring typos.
+       (python-indent-context, python-shell-prompt-regexp, run-python):
+       Remove superfluous backslashes.
+       (python-indent-line, python-nav-beginning-of-defun)
+       (python-shell-get-buffer, python-shell-get-process)
+       (python-info-current-defun, python-info-current-line-comment-p)
+       (python-info-current-line-empty-p, python-util-popn): Doc fixes.
+       (python-indent-post-self-insert-function, python-shell-send-file)
+       (python-shell-completion-get-completions)
+       (python-shell-completion-complete-or-indent)
+       (python-eldoc--get-doc-at-point): Reflow docstrings.
+
+2014-03-14  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/package.el (package-menu-mode-map):
+       Replace use of obsolete function alias.  Tweak menu item text.
+
+       * info.el (Info-finder-find-node):
+       Ignore the `emacs' metapackage.  (Bug#10813)
+
+       * finder.el (finder-list-matches): Include unversioned packages
+       in the result of a keyword search.
+
+       * finder.el (finder--builtins-descriptions): New constant.
+       (finder-compile-keywords): Use finder--builtins-descriptions.
+
+2014-03-14  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * simple.el (blink-matching-paren): Describe the new value,
+       `jump', enabling the old behavior.
+       (blink-matching-open): Use that value.  (Bug#17008)
+
+2014-03-14  Glenn Morris  <rgm@gnu.org>
+
+       * finder.el (finder-no-scan-regexp): Add leim-list.
+       (finder-compile-keywords):
+       Don't skip files with same basename.  (Bug#14010)
+       * Makefile.in (setwins_finder): New, excluding leim.
+       (finder-data): Use setwins_finder.
+
+       * help-fns.el (help-split-fundoc, help-add-fundoc-usage)
+       (help-function-arglist, help-make-usage): Move from here...
+       * help.el (help-split-fundoc, help-add-fundoc-usage)
+       (help-function-arglist, help-make-usage): ... to here.  (Bug#17001)
+       * emacs-lisp/bytecomp.el (byte-compile-lambda): Do not load help-fns.
+
+2014-03-14  Juanma Barranquero  <lekktu@gmail.com>
+
+       * net/socks.el (socks, socks-override-functions)
+       (socks-find-services-entry):
+       * progmodes/hideif.el (hif-set-var, hif-nexttoken, hif-comma)
+       (hif-find-ifdef-block):
+       * progmodes/modula2.el (m2-indent): Fix docstring typos.
+
+       * net/tls.el (tls-program): Reflow docstring.
+
+       * progmodes/pascal.el (pascal-mode-abbrev-table)
+       (pascal-imenu-generic-expression, pascal-auto-endcomments)
+       (pascal-mark-defun, pascal-comment-area, pascal-indent-level)
+       (pascal-outline-mode): Fix docstring typos.
+       (pascal-mode): Let define-derived-mode document mode hook.
+       (pascal-uncomment-area): Reflow.
+       (pascal-exclude-str-start, pascal-exclude-str-end): Add docstring.
+
+       * progmodes/opascal.el (opascal-compound-block-indent)
+       (opascal-case-label-indent): Fix docstring typos.
+       (opascal-mode): Fix typos; let defined-derived-mode document mode hook.
+
+2014-03-13  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords):
+       Fontify multiple adjacent negation chars.  (Bug#17004)
+
+2014-03-13  Tom Willemse  <tom@ryuslash.org>  (tiny change)
+
+       * emacs-lisp/package.el (package--prepare-dependencies):
+       Accept requirements without explicit version (bug#14941).
+
+2014-03-12  Juanma Barranquero  <lekktu@gmail.com>
+
+       * register.el (register-separator, copy-to-register): Doc fixes.
+       (register-preview-default): Remove unnecessary call to concat.
+
+       * frameset.el (frameset-restore): When checking for a visible frame,
+       use the action map instead of calling visible-frame-list.
+
+2014-03-12  Jonas Bernoulli  <jonas@bernoul.li>
+
+       * emacs-lisp/eieio.el (with-slots): Use cl-symbol-macrolet (bug#16998).
+
+2014-03-12  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (fit-frame-to-buffer): Get maximum width from
+       display's width instead of height.
+
+2014-03-12  Glenn Morris  <rgm@gnu.org>
+
+       * desktop.el (desktop-restore-frames)
+       (desktop-restore-in-current-display, desktop-restore-forces-onscreen)
+       (desktop-restore-reuses-frames): Doc tweaks.
+
+       * electric.el (electric-indent-mode): Doc fix.
+
+2014-03-12  Juanma Barranquero  <lekktu@gmail.com>
+
+       * vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot)
+       (cvs-checkout, cvs-mode-checkout, cvs-update-filter, cvs-mode-mark)
+       (cvs-mode-diff-head, cvs-mode-diff-repository, cvs-mode-diff-yesterday)
+       (cvs-mode-diff-vendor, cvs-mode-do, cvs-change-cvsroot)
+       (cvs-dired-use-hook): Fix docstring typos.
+       (cvs-mode-view-file-other-window, cvs-mode-byte-compile-files):
+       Doc fixes.
+
+       * vc/pcvs-defs.el (cvs-auto-remove-handled)
+       (cvs-auto-remove-directories, cvs-default-ignore-marks)
+       (cvs-idiff-imerge-handlers, cvs-reuse-cvs-buffer)
+       (cvs-execute-single-dir): Fix docstring typos.
+
+       * vc/pcvs-info.el (cvs-status-map, cvs-states): Fix docstring typos.
+       (cvs-fileinfo-pp, cvs-fileinfo-from-entries): Doc fixes.
+
+       * vc/pcvs-parse.el (cvs-parsed-fileinfo): Reflow docstring.
+
+       * vc/pcvs-util.el (cvs-flags-query, cvs-flags-set, cvs-prefix-set):
+       Fix docstring typos.
+
 2014-03-12  Juanma Barranquero  <lekktu@gmail.com>
 
        * frameset.el (frameset--jump-to-register): Add autoload; it could be
        dbus-call-method check for completion using a busy-wait loop with
        gradual backoff.
 
-2013-10-02  Michael Albinus  <michael.albinus@gmx.de>
+2014-02-16  Michael Albinus  <michael.albinus@gmx.de>
 
        Sync with Tramp 2.2.9.
 
        * net/shr.el (shr-tag-img): Prefer the title over the alt text
        (bug#16537).
 
+>>>>>>> MERGE-SOURCE
 2014-01-24  Juanma Barranquero  <lekktu@gmail.com>
 
        * net/eww.el (eww-download-callback):