aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* upstreamJoakim Verona2015-01-211-1/+22
* Merge branch 'master' into xwidgetJoakim Verona2015-01-2139-1044/+983
|\
| * Undo port to hypothetical nonzero Qnil casePaul Eggert2015-01-207-33/+35
| * lisp/emacs-lisp/eieio*.el: Rewrite our generics on top of cl-genericStefan Monnier2015-01-209-969/+384
| * paragraphs: update sentence-end-base :version after changing the defaultMichal Nazarewicz2015-01-201-1/+1
| * Removed test with spurious failures.Jorgen Schaefer2015-01-202-17/+5
| * Fix double chars in NS port.Jan Djärv2015-01-202-0/+7
| * eldoc: modify `eldoc-documentation-function' using `add-function'Michal Nazarewicz2015-01-209-14/+44
| * descr-text: add `describe-char-eldoc' describing character at pointMichal Nazarewicz2015-01-205-2/+211
| * paragraphs: recognise more Unicode characters as end of sentenceMichal Nazarewicz2015-01-202-1/+7
| * doh, fixing year in ChangeLog entries introduced by last two commitsMichal Nazarewicz2015-01-202-4/+2
| * tildify: add `tildify-double-space-undos'Michal Nazarewicz2015-01-204-18/+82
| * tildify: add `tildify-space' and `tildify-mode'Michal Nazarewicz2015-01-205-1/+153
| * Prefer xlispstrdup to avoid dumb calls to strlenDmitry Antipov2015-01-205-6/+14
| * * dispnew.c: Remove no-longer-valid comment.Paul Eggert2015-01-201-5/+0
| * Make vc-dir default to repository rootDaniel Colascione2015-01-192-1/+6
| * Correct an old fix for GTK font selectionPaul Eggert2015-01-192-1/+5
| * Fix minor bugs with printing null bytesPaul Eggert2015-01-193-2/+7
| * Expand xref help-echo stringDmitry Gutov2015-01-202-1/+2
| * Use etags-goto-tag-location in etags xref backendDmitry Gutov2015-01-203-4/+33
| * Port to hypothetical case where Qnil is nonzeroPaul Eggert2015-01-198-47/+68
* | rely less onimage modeJoakim Verona2015-01-211-6/+8
* | Native scrollingJoakim Verona2015-01-211-20/+76
* | Merge branch 'master' into xwidgetJoakim Verona2015-01-2026-220/+442
|\ \ | |/
| * Verify that Qnil is zero before relying on that in redisplay.Eli Zaretskii2015-01-193-0/+25
| * Fixup ChangeLogDmitry Gutov2015-01-191-1/+1
| * * lisp/ido.el: Update Customization instructionsDmitry Gutov2015-01-192-6/+10
| * Set up ido keymaps only onceJonas Bernoulli2015-01-192-111/+122
| * Fix the value default-directory gets in custom-make-dependencies.Ivan Shmakov2015-01-192-1/+7
| * Prefer memset to repeatedly assigning QnilPaul Eggert2015-01-1910-51/+79
| * xref: Use other-window-scroll-buffer and user-errorDmitry Gutov2015-01-192-1/+8
| * Use quit-window to hide buffers temporarily displayed by xrefDmitry Gutov2015-01-192-16/+48
| * Perform xref jump even inside indentation or at eolDmitry Gutov2015-01-192-1/+7
| * * lisp/emacs-lisp/eieio-core.el: Add `subclass' specializer for cl-generic.Stefan Monnier2015-01-185-5/+48
| * EIEIO&cl-generic: Add obsolescence warnings and fix corner caseStefan Monnier2015-01-187-23/+75
| * (package--append-to-alist): Updated docstring due to new name.Artur Malabarba2015-01-182-3/+6
| * package.el (package--append-to-alist): Renamed from `add-to-alist'Artur Malabarba2015-01-182-3/+8
* | Merge branch 'xwscroll' into xwidgetJoakim Verona2015-01-202-10/+83
|\ \
| * | Implement native scrolling of the webkit xwidgetJoakim Verona2015-01-202-10/+83
* | | merge masterJoakim Verona2015-01-1832-516/+824
|\ \ \ | | |/ | |/|
| * | Fix seq-subseq and cl-subseq for bad bounding indicesLeo Liu2015-01-185-26/+31
| * | * lisp/emacs-lisp/cl-generic.el: Add support for cl-next-method-p.Stefan Monnier2015-01-173-16/+84
| * | Fix mistake in rebase/merge conflict resolution.Ulrich Müller2015-01-181-3/+0
| * | Update docstring of emacs-repository-get-version.Ulrich Müller2015-01-172-4/+6
| * | Unloading support for misearch.Ivan Shmakov2015-01-172-0/+22
| * | Do not clear the session when trying to read a non-existent desktop file.Ivan Shmakov2015-01-172-1/+3
| * | Fix: inhibit point motion hooks when encoding an enriched document.Ivan Shmakov2015-01-172-1/+6
| * | Fix dir-locals handling for non-file buffers.Ivan Shmakov2015-01-172-1/+7
| * | Avoid mapcar in two cases in files.el.Ivan Shmakov2015-01-172-4/+9
| * | Ignore print-length and print-level while formatting url-cookie data.Ivan Shmakov2015-01-172-3/+9