lp:ubuntu/trusty-proposed/emacs24

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

14. By Barry Warsaw on 2014-03-07

* Merge from Debian, with remaining changes:
  - debian/patches/0009-upstream-bug-14829.patch: Patch from upstream
    issue tracker to fix window splitting when split-window-keep-point
    is nil.
  - debian/patches/0008-No-redisplay-when-reading-dbus-events.patch:
    Cherry pick from upstream bzr a fix for a redisplay bug while
    reading dbus events.
  - debian/rules: Make sure the emacs24-el directory exists.
  - emacsVER-lp725988.patch: Set the X EMACS_CLASS to "Emacs24" to please
    bamf and gnome-shell.
  - debian/emacsVER.desktop: Also set StartupWMClass for bamf and
    gnome-shell.
  - debian/control.in: Have emacs24-common Depends on
    emacs24-common-non-dfsg, now that it is out of multiverse.
    Update debian/copyright to match.
  - debian/control.in: Use libtiff5-dev in place of libtiff4-dev.

13. By Barry Warsaw on 2013-07-26

debian/patches/0009-upstream-bug-14829.patch: Patch from upstream
issue tracker to fix window splitting when split-window-keep-point
is nil.

12. By Barry Warsaw on 2013-06-14

* debian/patches/0008-No-redisplay-when-reading-dbus-events.patch:
  Cherry pick from upstream bzr a fix for a redisplay bug while
  reading dbus events.
* debian/rules: Make sure the emacs24-el directory exists.

11. By Dimitri John Ledkov on 2013-06-03

* Merge from Debian, remaining changes:
   - emacsVER-lp725988.patch: Set the X EMACS_CLASS to "Emacs24" to please
     bamf and gnome-shell.
   - debian/emacsVER.desktop: Also set StartupWMClass for bamf and
     gnome-shell.
   - Have emacs24-common Depends on emacs24-common-non-dfsg, now that it
     is out of multiverse. Update debian/copyright to match.
   - debian/control.in: Use libtiff5-dev in place of libtiff4-dev.

10. By Dimitri John Ledkov on 2013-04-09

Fix 'Ediff' window shrinks horizontally to one column wide (LP:
#1059633) Thanks marga-9 for the patch.

9. By Dimitri John Ledkov on 2013-03-05

* Resynchronise with Debian. Remaining changes:
   - emacsVER-lp725988.patch: Set the X EMACS_CLASS to "Emacs24" to please
     bamf and gnome-shell.
   - debian/emacsVER.desktop: Also set StartupWMClass for bamf and
     gnome-shell.
   - Have emacs24-common Depends on emacs24-common-non-dfsg, now that it
     is out of multiverse. Update debian/copyright to match.
   - debian/control.in: Use libtiff5-dev in place of libtiff4-dev.
   - Apply upstream patch for bug 12764 to fix maddeningly broken behavior
     with quit-window.

8. By Barry Warsaw on 2012-12-13

Apply upstream patch for bug 12764 to fix maddeningly broken behavior
with quit-window.

7. By Colin Watson on 2012-11-26

* Resynchronise with Debian. Remaining changes:
   - emacsVER-lp725988.patch: Set the X EMACS_CLASS to "Emacs24" to please
     bamf and gnome-shell.
   - debian/emacsVER.desktop: Also set StartupWMClass for bamf and
     gnome-shell.
   - Have emacs24-common Depends on emacs24-common-non-dfsg, now that it
     is out of multiverse. Update debian/copyright to match.
   - debian/control.in: Use libtiff5-dev in place of libtiff4-dev.

6. By Colin Watson on 2012-09-22

* Backport from Debian (Rob Browning):
  - Stop producing the emacs binary metapackage.
    Move the emacs binary metapackage to its own source package
    (emacs-defaults, cf. gcc-defaults). This will prevent emacs23 and
    emacs24 from producing the same binary package.

5. By Marc Deslauriers on 2012-09-21

* SECURITY UPDATE: arbitrary lisp code execution via crafted file
  - debian/patches/CVE-2012-3479.patch: ignore eval: forms that are not
    known to be safe if enable-local-variables is set to :safe in
    lisp/files.el.
  - CVE-2012-3479