1. 22 Dec, 2016 11 commits
  2. 20 Dec, 2016 1 commit
    • Jonas Bernoulli's avatar
      magit-hook-custom-get: new function used to initialize hook options · d6b820c1
      Jonas Bernoulli authored
      Third-party hooks should not be defined as options, at least not when
      they have a non-nil value, because otherwise an early `add-hook' would
      not add to the hook but initialize it to just the added function.  But
      users expect to be able to customize hooks, so we do it anyway.
      
      Previously each `defcustom' form that defines a hook was preceded by a
      form which made sure that the default functions got added to the hook
      even when users added their own functions earlier.  Unfortunately, and
      surprisingly long undiscovered, that had the side-effect of overriding
      any customization made using the Custom interface.
      
      Now we use an approach that works in both cases, obviously.
      
      Fixes #2902.
      d6b820c1
  3. 19 Dec, 2016 7 commits
  4. 15 Dec, 2016 1 commit
  5. 14 Dec, 2016 12 commits
    • Kyle Meyer's avatar
      magit-log-wash-rev: correct reflog comment · 2fc26ea8
      Kyle Meyer authored
      The comment added in d430d856 (magit-log-wash-rev: work around `git
      reflog show' bug, 2016-12-01) states that the partial trailing line
      "has no basis in the data stored in the file".  However, as far as I
      can tell, this partial line occurs if some reflog entries have been
      expired (e.g., by 'git gc').  The reported hash on this partial line
      seems to always correspond to the "old hash" field of the oldest
      reflog entry.  That is, this hash is the first field of the first
      entry in the corresponding .git/logs/refs/ file.
      
      Update the comment to reflect this.
      
      See also 81a6241e (magit-log-reflog-re: Allow for partial line,
      2015-04-11).
      2fc26ea8
    • Kyle Meyer's avatar
      aa10bbb7
    • Jonas Bernoulli's avatar
      Silence byte-compiler · 12ae09c1
      Jonas Bernoulli authored
      12ae09c1
    • Jonas Bernoulli's avatar
      Merge branch 'jb/jkl' [#2900] · 35150269
      Jonas Bernoulli authored
      35150269
    • Jonas Bernoulli's avatar
      Add support for JќL key bindings · f629795f
      Jonas Bernoulli authored
      JќL is the name I have given to my (for now) personal key bindings,
      which replace "bpnf" with "jikl" for navigation (similar to how vi
      uses "hjkl", but non-modal).  Maintaining such changed key bindings
      across all the packages I use has proven to be challenging to say the
      least. Recently I have decided to try a new approach - just patch the
      packages that I use.  That might seem like bad idea, and maybe it is,
      but all the others didn't really scale either.  (And considering that
      I have written a package manager, Epkg, that is supposed to help with
      exactly this sort of thing, I ought to try that approach.)
      
      However for Magit patching is not feasible, because I work on that all
      the time, and sometimes when I work on a feature branch I do have to
      restart Emacs.  I need my key bindings even when I am on a feature
      branch and not by own personal key bindings branch.
      
      Sometimes I add some optional functionality to Magit for the benefit
      of a very small number of users, sometimes consisting of a single
      user, who manages to convince me how very important a change is, even
      though nobody else seems to have the same need.  Well, this time that
      user is me.
      f629795f
    • Jonas Bernoulli's avatar
      Cosmetic improvements for many keymap definitions · 441d9c87
      Jonas Bernoulli authored
      Some of the rearrangement is a bit strange. These changes prepare
      for those that come in the next commit.  Look at that if you want
      to know why some binding definitions have moved to the beginnings
      of their respective definition blocks.
      441d9c87
    • Jonas Bernoulli's avatar
      2ae30c02
    • Jonas Bernoulli's avatar
      173bacc2
    • Jonas Bernoulli's avatar
    • Kyle Meyer's avatar
      Update release notes · b8711b4d
      Kyle Meyer authored
      b8711b4d
    • Kyle Meyer's avatar
      magit-reflog-refresh-buffer: disambiguate revision argument · 5264ffcb
      Kyle Meyer authored
      In cases where the passed revision and a file were ambiguous, the git
      call silently failed, leading to the reflog buffer incorrectly
      reporting an empty reflog for the revision.
      5264ffcb
    • Kyle Meyer's avatar
      Correct some documentation typos · 0b3a269f
      Kyle Meyer authored
      0b3a269f
  6. 10 Dec, 2016 3 commits
  7. 09 Dec, 2016 2 commits
    • Alexander Gramiak's avatar
      magit-emacs-Q-command: load absolute path · 83980c66
      Alexander Gramiak authored
      This matches the absolute paths for library directories and avoids Emacs
      bug #16406.
      83980c66
    • Kyle Meyer's avatar
      magit-display-buffer-fullcolumn-most-v1: don't bury commit message · 49a7abc4
      Kyle Meyer authored
      Update magit-display-buffer-fullcolumn-most-v1 to specifically handle
      magit-diff-mode buffers created while committing.  This prevents the
      diff buffer from filling the entire frame and hiding the commit
      message.
      
      We decided to version the names of these display functions so that we
      could modify their behavior without worrying about changing something
      that a user has grown used to.  However, in this case, the behavior is
      clearly a defect, so let's just update v1.
      
      Fixes #2891.
      49a7abc4
  8. 07 Dec, 2016 3 commits