d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge NetBSD's rev. 1.41:

Browse Source 
PR/31012: Barry Naujok: libedit el_get with EL_EDITOR op does not work
Fixed as suggested.
This commit is contained in:
Stefan Farfeleder 2005-10-04 21:45:42 +00:00
parent 4d71248bc3
commit bc6e20f014
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=150945
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libedit/el.c
View File

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $NetBSD: el.c,v 1.40 2005/08/01 23:00:15 christos Exp $ * $NetBSD: el.c,v 1.41 2005/08/19 04:21:47 christos Exp $
*/ */
#if !defined(lint) && !defined(SCCSID) #if !defined(lint) && !defined(SCCSID)
@ -301,11 +301,11 @@ el_get(EditLine *el, int op, void *ret)
switch (op) { switch (op) {
case EL_PROMPT: case EL_PROMPT:
case EL_RPROMPT: case EL_RPROMPT:
rv = prompt_get(el, (void *) &ret, op); rv = prompt_get(el, (el_pfunc_t *) ret, op);
break; break;
case EL_EDITOR: case EL_EDITOR:
rv = map_get_editor(el, (void *) &ret); rv = map_get_editor(el, (const char **)ret);
break; break;
case EL_SIGNAL: case EL_SIGNAL: