+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
* 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.
+ * 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)
2014-03-13 Dmitry Gutov <dgutov@yandex.ru>
- * progmodes/ruby-mode.el (ruby-font-lock-keywords): Fontify
- multiple adjacent negation chars. (Bug#17004)
+ * 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)
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):
HCoop / bpt / emacs.git / blobdiff