Skip to content

Fixes #1234#1250

Merged
trefis merged 2 commits intoocaml:masterfrom
atharvashukla:patch-1
Jan 29, 2021
Merged

Fixes #1234#1250
trefis merged 2 commits intoocaml:masterfrom
atharvashukla:patch-1

Conversation

@atharvashukla
Copy link
Copy Markdown
Contributor

Adding a "when" argument is mandatory for define-obsolete-function-alias since emacs Emacs-23.1. If this is not added, emacs shows an error on startup (See Issue #1234).

NOTE: I'm guessing the functions are made obsolete in v2.5.4 (I simply looked at the "blame" date on github and matched with the version that was released after 28th Feb 2017) Maintainers may be able to provide a more accurate version/date for this argument

Adding a "when" argument is mandatory for define-obsolete-function-alias since emacs Emacs-23.1. If this is not added, emacs shows an error on startup (See Issue #1234).
@trefis
Copy link
Copy Markdown
Contributor

trefis commented Jan 29, 2021

I think they haven't all been deprecated in exactly the same version, but they all have been since at least v3.0, so let's perhaps just use that?
Other than that, happy to merge.

@trefis trefis merged commit f8fd46b into ocaml:master Jan 29, 2021
@voodoos voodoos mentioned this pull request Apr 8, 2021
32 tasks
voodoos added a commit to voodoos/merlin that referenced this pull request Apr 8, 2021
voodoos added a commit to voodoos/merlin that referenced this pull request Apr 9, 2021
voodoos added a commit that referenced this pull request Apr 9, 2021
voodoos added a commit to voodoos/opam-repository that referenced this pull request Apr 13, 2021
CHANGES:

Tue Apr 12 11:44:22 AM CET 2021

  + merlin binary
    - external configuration reading:
      + use relative paths to communicate with Dune when possible. This solves
        issues related to symlinks on Unix and improve Windows support (ocaml/merlin#1271,
        fixes ocaml/merlin#1288)
      + make the `workdir` configuration value when using the
        `dune ocaml-merlin` configuration provider the same as when using
        `dot-merlin-reader` so that ppxes behaves in the same way as before
        (ocaml/merlin#1284, fixes ocaml/dune#4479, discussion in ocaml/merlin#1292)
    - destruct:  make the destruct command more resilient to ill-typed
      expressions and when called without nodes (ocaml/merlin#1304, fixes ocaml/merlin#1300)
    - Mppx: don't restore cookies after invocation. Ppx are invoked only once
      so there is no need to manage cookies. This small change should increase
      performance and should not change any other behavior (ocaml/merlin#1309)
    - windows:
      + system command variant: do not open a window console when
        launching a ppx (ocaml/merlin#1270, fixes ocaml/merlin#714)
      + fix Emacs hanging when starting Merlin (ocaml/merlin#1263)
      + fix path canonicalization (ocaml/merlin#1254)
    - fix same file documentation bug (ocaml/merlin#1265 by @ulugbekna, fixes ocaml/merlin#1261)
  + editor modes
    - emacs:
      + modernization of the elisp code and conformance with coding
        guidelines (ocaml/merlin#1247, ocaml/merlin#1310 by Steve Purcell )
      + use opam var where applicable (ocaml/merlin#1310)
      + fix "wrong number of argument" (ocaml/merlin#1250 by @atharvashukla, fixes ocaml/merlin#1234)
      + fix for Neovim's CursorMoved semantics (ocaml/merlin#1213 by @ddickstein)
    - vim & emacs : new client-side "merlin use package" commands, restoring
      previous behavior (ocaml/merlin#1272, fixes ocaml/merlin#1191)
  + test suite
    - cover the document fix (ocaml/merlin#1265, ocaml/merlin#1315)
@atharvashukla atharvashukla deleted the patch-1 branch April 13, 2021 23:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants