File 2878-Emacs-erlang-mode-bump-versions-and-refactor-flet-ex.patch of Package erlang

From 98cff9adff7c11f72d5466bdc8b4336523837520 Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Tue, 15 Oct 2019 16:10:38 +0200
Subject: [PATCH 08/10] Emacs erlang-mode: bump versions and refactor flet
 expressions

This commit refactors away the flet expressions that existed in
erlang-eunit.el and erlang-flymake.el. Emacs lisp flet expressions
have been deprecated in since Emacs version 24.3.

The version number for erlang-mode is also bumped and the required
minimum Emacs version is increased from 24.1 to 24.3.
---
 lib/tools/emacs/erlang-eunit.el   | 4 ++--
 lib/tools/emacs/erlang-flymake.el | 4 ++--
 lib/tools/emacs/erlang.el         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/tools/emacs/erlang-eunit.el b/lib/tools/emacs/erlang-eunit.el
index 53543d7b01..52c5783806 100644
--- a/lib/tools/emacs/erlang-eunit.el
+++ b/lib/tools/emacs/erlang-eunit.el
@@ -22,7 +22,7 @@
 ;;; Author: Klas Johansson
 
 (eval-when-compile
-  (require 'cl))
+  (require 'cl-lib))
 (require 'erlang)
 
 (defvar erlang-eunit-src-candidate-dirs '("../src" ".")
@@ -319,7 +319,7 @@ With prefix arg, compiles for debug and runs tests with the verbose flag set."
     ;; instead of possibly several: one for each file to compile,
     ;; for instance for both x.erl and x_tests.erl.
     (save-some-buffers erlang-eunit-autosave)
-    (flet ((save-some-buffers (&optional any) nil))
+    (cl-letf (((symbol-function 'save-some-buffers) #'ignore))
 
       ;; Compilation of the source file is mandatory (the file must
       ;; exist, otherwise the procedure is aborted).  Compilation of the
diff --git a/lib/tools/emacs/erlang-flymake.el b/lib/tools/emacs/erlang-flymake.el
index 0b7936a81f..4e4da51e7a 100644
--- a/lib/tools/emacs/erlang-flymake.el
+++ b/lib/tools/emacs/erlang-flymake.el
@@ -22,7 +22,7 @@
 
 (require 'flymake)
 (eval-when-compile
-  (require 'cl))
+  (require 'cl-lib))
 
 (defvar erlang-flymake-command
   "erlc"
@@ -68,7 +68,7 @@ check on newline and when there are no changes)."
 
 (defun erlang-flymake-init ()
   (let* ((temp-file
-          (flet ((flymake-get-temp-dir () (erlang-flymake-temp-dir)))
+          (cl-letf (((symbol-function 'flymake-get-temp-dir) #'erlang-flymake-temp-dir))
             (flymake-init-create-temp-buffer-copy
              'flymake-create-temp-with-folder-structure)))
          (code-dir-opts
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index a8f17a364b..c95ef14ae6 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -4,8 +4,8 @@
 ;; Author:   Anders Lindgren
 ;; Keywords: erlang, languages, processes
 ;; Date:     2011-12-11
-;; Version:  2.8.2
-;; Package-Requires: ((emacs "24.1"))
+;; Version:  2.8.3
+;; Package-Requires: ((emacs "24.3"))
 
 ;; %CopyrightBegin%
 ;;
@@ -87,7 +87,7 @@
   "The Erlang programming language."
   :group 'languages)
 
-(defconst erlang-version "2.8.2"
+(defconst erlang-version "2.8.3"
   "The version number of Erlang mode.")
 
 (defcustom erlang-root-dir nil
-- 
2.16.4